ooo-build r14105 - in trunk: . patches/dev300

[freuter svn gnome org]

Author: freuter
Date: Fri Sep 26 11:24:31 2008
New Revision: 14105
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14105&view=rev

Log:
writer doc margin text rotates when opened in word (n#404221)

Added:
   trunk/patches/dev300/svx-text-rotation-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Sep 26 11:24:31 2008
@@ -481,6 +481,9 @@
 samba-hyperlinks-sc-sd.diff, n#382718, jholesov
 tools-qa-urlobj-unittest.diff, n#261623, flr
 
+# writer doc margin text rotates when opened in word
+svx-text-rotation-fix.diff, n#404221, flr
+
 # check real help path defined in registry instead of the $(instpath)/help
 sfx-check-real-help-path.diff, i#81139, pmladek
 

Added: trunk/patches/dev300/svx-text-rotation-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/svx-text-rotation-fix.diff	Fri Sep 26 11:24:31 2008
@@ -0,0 +1,37 @@
+Index: svx/source/msfilter/escherex.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/msfilter/escherex.cxx,v
+retrieving revision 1.73
+diff -u -r1.73 escherex.cxx
+--- svx/source/msfilter/escherex.cxx	31 Jul 2007 17:31:58 -0000	1.73
++++ svx/source/msfilter/escherex.cxx	11 Aug 2008 12:26:47 -0000
+@@ -853,6 +853,29 @@
+ 
+ 	if ( nTextId )
+ 		AddOpt( ESCHER_Prop_lTxid, nTextId );
++
++    // n#404221: In case of rotation we need to write the txtflTextFlow 
++    // attribute too.
++	if (bIsTextFrame) {
++	    sal_uInt16 nAngle = EscherPropertyValueHelper::GetPropertyValue( 
++		aAny, 
++		rXPropSet,
++		String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), 
++		sal_True )
++		? (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10 : 0;
++	    if (nAngle==900) {
++		AddOpt( ESCHER_Prop_txflTextFlow, 1 );
++		bSuppressRotation=true;
++	    }
++	    if (nAngle==1800) {
++		AddOpt( ESCHER_Prop_txflTextFlow, 2 );
++		bSuppressRotation=true;
++	    }
++	    if (nAngle==2700) {
++		AddOpt( ESCHER_Prop_txflTextFlow, 3 );
++		bSuppressRotation=true;
++	    }
++	}
+ }
+ 
+ static sal_Bool GetLineArrow( const sal_Bool bLineStart,