[Libreoffice-commits] .: Branch 'libreoffice-3-6' - filter/source

[Libreoffice Gerrit user]

 filter/source/msfilter/escherex.cxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 6ccbb67d653cb6769fdea7b8170840ace3f8b82c
Author: Lennard <Wasserthal at nefkom.net>
Date:   Sun Nov 25 14:50:42 2012 +0100

    fdo#34897 numbers were wrong, code unnecessary
    
    Text flow is perhaps not intended to specify rotation, created data may misbehave on
    other applications, and there is no reason for this unnecessary special case.
    (Especially obvious because there is no text flow that causes 180 deg rotation.)
    Theoretically, you could delete all three if-cases as in the earlier version of this patch,
    but that ?could? come at the cost of backwards compatibility.
    
    Change-Id: I0b1cac78e549c2126d7e45298629e28fc76ac95d
    Signed-off-by: Lennard <Wasserthal at nefkom.net>
    Reviewed-on: https://gerrit.libreoffice.org/1165
    Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
    (cherry picked from commit 1f1ebf7d91d1b19c05d7114853ecdc40c8444a6a)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 16459e5..56ed5c3 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -698,16 +698,10 @@ void EscherPropertyContainer::CreateTextProperties(
         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;
+        AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflBtoT );
         }
         if (nAngle==2700) {
-        AddOpt( ESCHER_Prop_txflTextFlow, 3 );
-        bSuppressRotation=true;
+        AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflTtoBA );
         }
     }
 }