summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-24 23:12:38 +0100
committerMichael Stahl <mstahl@redhat.com>2013-01-24 23:31:33 +0100
commit2823789bec0c029d9714aff0ed65923e23177ef9 (patch)
tree95016883962ce5b0f2bd8786f3418efa3bda2a4c /filter
parent7b9d0da45727f03081471653efe08157f58b2224 (diff)
fdo#58204: PPT export: fix text rotation in shapes:
EscherPropertyContainer::CreateTextProperties: do not write ESCHER_Prop_txflTextFlow for custom shapes. This happens to export the rotation properly for the WW8 bugdoc of n#404221, as well as the PPT at fdo#58204 and both PPTs at fdo#34897, one of which (mangle.ppt) was not handled properly on master currently. The author disclaims having any actual knowledge about rotation properties in MSO files. (regression from 24dd42f316e5cb16ba726c05ba486d53e033052d) Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/escherex.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index cf08b7f339cd..d456be68d81e 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -679,7 +679,8 @@ void EscherPropertyContainer::CreateTextProperties(
// n#404221: In case of rotation we need to write the txtflTextFlow
// attribute too.
- if (bIsTextFrame)
+ // fdo#58204: not custom shapes (TODO: other cases when it doesn't work?)
+ if (bIsTextFrame && !bIsCustomShape)
{
sal_uInt16 nAngle = EscherPropertyValueHelper::GetPropertyValue(
aAny, rXPropSet, OUString( "RotateAngle" ), sal_True ) ?