[PATCH] fdo#58204: msfilter: do not add ESCHER_Prop_txflTextFlow

Michael Stahl (via Code Review) gerrit at gerrit.libreoffice.org
Wed Jan 23 05:28:00 PST 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1825

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/1825/1

fdo#58204: msfilter: do not add ESCHER_Prop_txflTextFlow

This breaks PPT export quite badly.
(regression from 24dd42f316e5cb16ba726c05ba486d53e033052d)

Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6
---
M filter/source/msfilter/escherex.cxx
1 file changed, 0 insertions(+), 17 deletions(-)



diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index cf08b7f..f89825f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -676,23 +676,6 @@
 
     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, OUString( "RotateAngle" ), sal_True ) ?
-                (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10 : 0;
-        if (nAngle==900)
-        {
-            AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflBtoT );
-        }
-        if (nAngle==2700)
-        {
-            AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflTtoBA );
-        }
-    }
 }
 
 sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,

-- 
To view, visit https://gerrit.libreoffice.org/1825
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>



More information about the LibreOffice mailing list