[GME-commit] GMESRC/GME/MgaUtil MakeClosure.cpp,1.6,1.7 MakeClosure.h,1.3,1.4

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/MgaUtil
In directory braindrain:/tmp/cvs-serv15205

Modified Files:
	MakeClosure.cpp MakeClosure.h 
Log Message:
Miniproject dump fixed.


CVS User: zolmol

Index: MakeClosure.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MakeClosure.cpp	3 Aug 2004 18:03:54 -0000	1.6
--- MakeClosure.cpp	3 Aug 2004 21:20:12 -0000	1.7
***************
*** 184,187 ****
--- 184,189 ----
  			selectTop();
  			totalWrap();
+ 			clearTopObjs(); // no need for the top objects, this is a sign to dump from the RootFolder
+ 
  		}
  		else if ( m_iContainerOption == 1) // automatic wrapping
***************
*** 1439,1442 ****
--- 1441,1450 ----
  	// the clipboard contains a project dumped?) another dumper is used
  	return m_topFcos.empty() && m_topFolds.empty();
+ }
+ 
+ void CMakeClosure::clearTopObjs()
+ {
+ 	m_topFcos.clear();
+ 	m_topFolds.clear();
  }
  

Index: MakeClosure.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MakeClosure.h	2 Aug 2004 22:51:25 -0000	1.3
--- MakeClosure.h	3 Aug 2004 21:20:12 -0000	1.4
***************
*** 84,87 ****
--- 84,88 ----
  	
  	bool noTopObjs(); // signals if The RootFolder is the common top (root) of all selected objects
+ 	void clearTopObjs();
  	void getTopFCOs( IMgaFCOs **res_fcos);
  	void getTopFolders( IMgaFolders **res_folds);
***************
*** 173,177 ****
  	CComObjPtrVector<IMgaFolder> m_newlySelFolds; // will be copied into selfolders
  
! 	// members used for the non-wrapping case
  	CComObjPtrVector<IMgaFolder> m_topFolds; // parentless (top) folders
  	CComObjPtrVector<IMgaFCO> m_topFcos; // parentless (top) fcos
--- 174,178 ----
  	CComObjPtrVector<IMgaFolder> m_newlySelFolds; // will be copied into selfolders
  
! 	// members used for the non-miniproject cases
  	CComObjPtrVector<IMgaFolder> m_topFolds; // parentless (top) folders
  	CComObjPtrVector<IMgaFCO> m_topFcos; // parentless (top) fcos