summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-24 23:12:38 +0100
committerBosdonnat Cedric <cedric.bosdonnat@free.fr>2013-01-25 14:52:47 +0000
commit666210dec152f8aa781b22495cf55e9a89d90d67 (patch)
tree563c862617d3a7d711e692e192edf1f840d9512f
parent54617ada5c91c442e73f0b652a6e50f8c27ac107 (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) (cherry picked from commit 2823789bec0c029d9714aff0ed65923e23177ef9) Conflicts: filter/source/msfilter/escherex.cxx Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6 Reviewed-on: https://gerrit.libreoffice.org/1862 Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
-rw-r--r--filter/source/msfilter/escherex.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index cdf729557179..69b7b4c7a262 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -682,7 +682,9 @@ 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,