summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennard <Wasserthal@nefkom.net>2012-11-25 14:50:42 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-11-28 09:55:27 +0000
commit6ccbb67d653cb6769fdea7b8170840ace3f8b82c (patch)
tree20542d301023e37a46665d99d9af8c858b2d2a32
parent7689f91451ad07e2c324cbe142d3d002610d8c33 (diff)
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@nefkom.net> Reviewed-on: https://gerrit.libreoffice.org/1165 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> (cherry picked from commit 1f1ebf7d91d1b19c05d7114853ecdc40c8444a6a) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--filter/source/msfilter/escherex.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 16459e5491e0..56ed5c39914a 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 );
}
}
}