[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch, NONE, 1.1 openoffice.org.spec, 1.566, 1.567



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24077

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch 
Log Message:
rh#174148# pre-edit dtor in wrong place

openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch:
 source/core/doc/docnew.cxx    |    0 
 sw/source/core/doc/docnew.cxx |   18 +++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch ---
Index: source/core/doc/docnew.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/doc/docnew.cxx,v
retrieving revision 1.57
diff -u -p -u -r1.57 docnew.cxx
--- openoffice.org.orig/sw/source/core/doc/docnew.cxx	8 Nov 2005 17:16:18 -0000	1.57
+++ openoffice.org/sw/source/core/doc/docnew.cxx	29 Nov 2005 09:38:58 -0000
@@ -500,6 +500,15 @@ SwDoc::SwDoc() :
 
 SwDoc::~SwDoc()
 {
+	if( pExtInputRing )
+	{
+		Ring* pTmp = pExtInputRing;
+		pExtInputRing = 0;
+		while( pTmp->GetNext() != pTmp )
+			delete pTmp->GetNext();
+		delete pTmp;
+	}
+
     //!! needs to be done to destroy a possible SwFmtDrop format that may
     //!! be connected to a char format which may not otherwise be removed
     //!! and thus would leave a unremoved SwFmt object. (TL)
@@ -569,15 +578,6 @@ SwDoc::~SwDoc()
 	pBookmarkTbl->DeleteAndDestroy( 0, pBookmarkTbl->Count() );
 	DELETEZ( pMacroTable );
 
-	if( pExtInputRing )
-	{
-		Ring* pTmp = pExtInputRing;
-		pExtInputRing = 0;
-		while( pTmp->GetNext() != pTmp )
-			delete pTmp->GetNext();
-		delete pTmp;
-	}
-
 //JP: alt - loeschen ohne Flag ist teuer; Modify wird verschickt!
 //	aTOXTypes.DeleteAndDestroy( 0, aTOXTypes.Count() );
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- openoffice.org.spec	29 Nov 2005 08:52:01 -0000	1.566
+++ openoffice.org.spec	29 Nov 2005 09:35:11 -0000	1.567
@@ -193,6 +193,7 @@
 Patch40: workspace.cmcfixes22.patch
 Patch41: openoffice.org-1.9.122.oooXXXXX.systemxalan.patch
 Patch42: openoffice.org-2.0.1.oooXXXXX.vcl.missingglyph.patch
+Patch43: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -848,6 +849,7 @@
 %patch40 -p1 -b .workspace.cmcfixes22.patch
 %patch41 -p1 -b .oooXXXXX.systemxalan.patch
 %patch42 -p1 -b .oooXXXXX.vcl.missingglyph.patch
+%patch43 -p1 -b .ooo58606.sw.pre-edit.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3299,6 +3301,7 @@
 %changelog
 * Thu Nov 29 2005 Caolan McNamara <caolanm redhat com> - 1:2.0.1-0.142.2
 - rh#174147# openoffice.org-2.0.1.oooXXXXX.vcl.missingglyph.patch
+- rh#174148# openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 
 * Thu Nov 17 2005 Caolan McNamara <caolanm redhat com> - 1:2.0.1-0.142.1
 - next version


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]