ooo-build r14709 - in branches/ooo-build-3-0: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Wed Dec  3 09:39:59 2008
New Revision: 14709
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14709&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/svx-ppt-textstyle-fix.diff:
    Fix a regression from 2.4.1, where PPT import sometimes yields
    wrong text color and alignment. n#443127.



Added:
   branches/ooo-build-3-0/patches/dev300/svx-ppt-textstyle-fix.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Dec  3 09:39:59 2008
@@ -2726,6 +2726,7 @@
 jurt-jnilib-deliver.diff, i#93516, thorsten
 solenv-silent-mac-build.diff, thorsten
 instset-macos-langpacks.diff, i#64937, cloph
+svx-ppt-textstyle-fix.diff, n#443127, thorsten
 
 [ Fixes < dev300-m30 < ooo300-m3 ]
 pdfimport-system-poppler-m29.diff, i#92920, cmc

Added: branches/ooo-build-3-0/patches/dev300/svx-ppt-textstyle-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/svx-ppt-textstyle-fix.diff	Wed Dec  3 09:39:59 2008
@@ -0,0 +1,26 @@
+--- svx/source/svdraw/svdfppt.cxx~	2008-12-03 00:43:00.000000000 +0100
++++ svx/source/svdraw/svdfppt.cxx	2008-12-03 09:24:43.000000000 +0100
+@@ -5245,11 +5245,6 @@
+ 					rIn >> aSet.mnFontHeight;
+ 					aSet.mnAttrSet |= 1 << PPT_CharAttr_FontHeight;
+ 				}
+-				if ( nMask & 0x80000 )	// cfPosition
+-				{
+-					rIn >> aSet.mnEscapement;
+-					aSet.mnAttrSet |= 1 << PPT_CharAttr_Escapement;
+-				}
+ 				if ( nMask & 0x40000 )	// cfColor
+ 				{
+ 					sal_uInt32 nVal;
+@@ -5259,6 +5254,11 @@
+ 					aSet.mnColor = nVal;
+ 					aSet.mnAttrSet |= 1 << PPT_CharAttr_FontColor;
+ 				}
++				if ( nMask & 0x80000 )	// cfPosition
++				{
++					rIn >> aSet.mnEscapement;
++					aSet.mnAttrSet |= 1 << PPT_CharAttr_Escapement;
++				}
+ 				if ( nExtParaPos )
+ 				{
+ 					sal_uInt32 nExtBuInd = nMask & 0x3c00;