rpms/openoffice.org/devel workspace.sw24bf02.patch, NONE, 1.1 openoffice.org.spec, 1.1398, 1.1399

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21311

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.sw24bf02.patch 
Log Message:
Resolves: rhbz#428574 add workspace.sw24bf02.patch

workspace.sw24bf02.patch:

--- NEW FILE workspace.sw24bf02.patch ---
Index: sw/sw/source/core/layout/fly.cxx
diff -u sw/sw/source/core/layout/fly.cxx:1.86 sw/sw/source/core/layout/fly.cxx:1.86.160.1
--- sw/sw/source/core/layout/fly.cxx:1.86	Thu Sep 27 02:02:12 2007
+++ sw/sw/source/core/layout/fly.cxx	Mon Jan 21 03:37:14 2008
@@ -1190,6 +1190,21 @@
 			 pFrm->Lower() && pFrm->Lower()->IsColumnFrm() )
 			pFrm->InvalidateSize();
 	}
+
+    // --> OD 2008-01-21 #i85216#
+    // if vertical position is oriented at a layout frame inside a ghost section,
+    // assure that the position is invalidated and that the information about
+    // the vertical position oriented frame is cleared
+    if ( GetVertPosOrientFrm() && GetVertPosOrientFrm()->IsLayoutFrm() )
+    {
+        const SwSectionFrm* pSectFrm( GetVertPosOrientFrm()->FindSctFrm() );
+        if ( pSectFrm && pSectFrm->GetSection() == 0 )
+        {
+            InvalidatePos();
+            ClearVertPosOrientFrm();
+        }
+    }
+    // <--
 }
 
 /*************************************************************************


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1398
retrieving revision 1.1399
diff -u -r1.1398 -r1.1399
--- openoffice.org.spec	21 Jan 2008 11:04:27 -0000	1.1398
+++ openoffice.org.spec	21 Jan 2008 11:59:55 -0000	1.1399
@@ -142,6 +142,7 @@
 Patch68: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
 Patch69: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
 Patch70: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch71: workspace.sw24bf02.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1098,6 +1099,7 @@
 %patch68 -p1 -b .ooo85385.svtools.a11ycrash.patch
 %patch69 -p1 -b .ooo85321.vcl.pixmapleak.patch
 %patch70 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch71 -p1 -b .workspace.sw24bf02.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2872,6 +2874,7 @@
 * Mon Jan 21 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-3.3
 - fix openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch for warren
 - fix openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+- Resolves: rhbz#428574 add workspace.sw24bf02.patch
 
 * Sat Jan 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-3.2
 - Resolves: rhbz#429258 openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch