rpms/openoffice.org/devel openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch, NONE, 1.1 openoffice.org.spec, 1.361, 1.362

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch 
Log Message:
rh#161313# fix

openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch:
 source/filter/rtf/rtffly.cxx    |    0 
 sw/source/filter/rtf/rtffly.cxx |    7 +++++++
 2 files changed, 7 insertions(+)

--- NEW FILE openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch ---
Index: source/filter/rtf/rtffly.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/rtf/rtffly.cxx,v
retrieving revision 1.19
diff -u -p -u -r1.19 rtffly.cxx
--- openoffice.org.orig/sw/source/filter/rtf/rtffly.cxx	31 Jan 2005 13:56:32 -0000	1.19
+++ openoffice.org/sw/source/filter/rtf/rtffly.cxx	27 Jul 2005 10:26:32 -0000
@@ -494,6 +494,13 @@ void SwRTFParser::SetFlysInDoc()
 			pDoc->Move( aRg, aTmpIdx );
 		}
 
+        if (pSttNd->GetIndex() + 1 == pSttNd->EndOfSectionIndex())
+        {
+            ASSERT(!this, "nothing in this frame, not legal");
+            delete pFlySave;
+            continue;
+        }
+
 		pFlySave->aFlySet.Put( SwFmtCntnt( pSttNd ));
 
 		CalculateFlySize( pFlySave->aFlySet, pFlySave->nSttNd,


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- openoffice.org.spec	27 Jul 2005 08:53:27 -0000	1.361
+++ openoffice.org.spec	27 Jul 2005 10:38:56 -0000	1.362
@@ -166,6 +166,7 @@
 Patch59: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
 Patch60: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 Patch61: openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch
+Patch62: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -824,6 +825,7 @@
 %patch60 -p1 -b .rh156677.cripplemenus.sysui.patch
 %endif
 %patch61 -p1 -b .rh164310.selinux-pipegiveup.desktop.patch
+%patch62 -p1 -b .ooo52542.emptyrtfframes.sw.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3071,6 +3073,7 @@
 %changelog
 * Wed Jul 27 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.121-3
 - add rh#164310# pipe giveup
+- add openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch for rh#161313#
 
 * Tue Jul 26 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.121-2
 - rh#127576# add libgnomeprintui