rpms/openoffice.org/F-8 workspace.sw8u9bf01.patch, NONE, 1.1 openoffice.org.spec, 1.1341, 1.1342

[Caolan McNamara (caolanm)]

Author: caolanm

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

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

workspace.sw8u9bf01.patch:

--- NEW FILE workspace.sw8u9bf01.patch ---
Index: sw/sw/source/core/txtnode/thints.cxx
diff -u sw/sw/source/core/txtnode/thints.cxx:1.52.114.1 sw/sw/source/core/txtnode/thints.cxx:1.52.114.1.14.1
--- sw/sw/source/core/txtnode/thints.cxx:1.52.114.1	Thu Aug 30 08:00:08 2007
+++ sw/sw/source/core/txtnode/thints.cxx	Mon Sep 24 03:49:08 2007
@@ -547,7 +547,8 @@
                 aNewSet.Put( *pNewStyle );
 
                 // --> FME 2007-4-11 #i75750# Remove attributes already set at whole paragraph
-                if ( rNode.HasSwAttrSet() && aNewSet.Count() )
+                // --> FME 2007-09-24 #i81764# This should not be applied for no length attributes!!! <--
+                if ( !bNoLengthAttribute && rNode.HasSwAttrSet() && aNewSet.Count() )
                 {
                     SfxItemIter aIter( aNewSet );
                     const SfxPoolItem* pItem = aIter.GetCurItem();
@@ -583,7 +584,8 @@
 
                 SfxItemSet* pNewSet = 0;
                 // --> FME 2007-4-11 #i75750# Remove attributes already set at whole paragraph
-                if ( rNode.HasSwAttrSet() && pNewStyle->Count() )
+                // --> FME 2007-09-24 #i81764# This should not be applied for no length attributes!!! <--
+                if ( !bNoLengthAttribute && rNode.HasSwAttrSet() && pNewStyle->Count() )
                 {
                     SfxItemIter aIter( *pNewStyle );
                     const SfxPoolItem* pItem = aIter.GetCurItem();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1341
retrieving revision 1.1342
diff -u -r1.1341 -r1.1342
--- openoffice.org.spec	11 Jan 2008 09:53:47 -0000	1.1341
+++ openoffice.org.spec	18 Jan 2008 15:01:31 -0000	1.1342
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 11
+%define rh_rpm_release 12
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -162,6 +162,7 @@
 Patch80: openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
 Patch81: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
 Patch82: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
+Patch83: workspace.sw8u9bf01.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1119,6 +1120,7 @@
 %patch80 -p1 -b .ooo81314.i18npool.crash.patch
 %patch81 -p1 -b .ooo85055.psprint.linetoolong.patch
 %patch82 -p1 -b .ooo83410.solenv.renameserbian.patch
+%patch83 -p1 -b .workspace.sw8u9bf01.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2825,6 +2827,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %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
+
 * 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
 - Resolves: rhbz#425701/ooo#83410 try to fix serbian translations