rpms/openoffice.org/F-8 workspace.sw24bf02.patch, NONE, 1.1 openoffice.org.spec, 1.1342, 1.1343

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220

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/F-8/openoffice.org.spec,v
retrieving revision 1.1342
retrieving revision 1.1343
diff -u -r1.1342 -r1.1343
--- openoffice.org.spec	18 Jan 2008 15:01:31 -0000	1.1342
+++ openoffice.org.spec	21 Jan 2008 11:57:39 -0000	1.1343
@@ -163,6 +163,7 @@
 Patch81: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
 Patch82: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
 Patch83: workspace.sw8u9bf01.patch
+Patch84: workspace.sw24bf02.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1121,6 +1122,7 @@
 %patch81 -p1 -b .ooo85055.psprint.linetoolong.patch
 %patch82 -p1 -b .ooo83410.solenv.renameserbian.patch
 %patch83 -p1 -b .workspace.sw8u9bf01.patch
+%patch84 -p1 -b .workspace.sw24bf02.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2829,6 +2831,7 @@
 %changelog
 * Fri Jan 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.12-UNRELEASED
 - Resolves: rhbz#429278 add workspace.sw8u9bf01.patch
+- Resolves: rhbz#428574 add workspace.sw24bf02.patch
 
 * Fri Jan 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.11
 - Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch