ooo-build r13511 - in branches/ooo-build-2-4-1: . patches/src680

[freuter svn gnome org]

Author: freuter
Date: Mon Aug 11 12:48:00 2008
New Revision: 13511
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13511&view=rev

Log:
n#404221: Fixed regression on svx-text-rotation-fix.diff

Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/svx-text-rotation-fix.diff

Modified: branches/ooo-build-2-4-1/patches/src680/svx-text-rotation-fix.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/svx-text-rotation-fix.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/svx-text-rotation-fix.diff	Mon Aug 11 12:48:00 2008
@@ -4,22 +4,34 @@
 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	7 Jul 2008 09:18:50 -0000
-@@ -853,6 +853,17 @@
++++ 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.
-+    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==2700) {
-+	AddOpt( ESCHER_Prop_txflTextFlow, 3 );
-+    }
++	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,