diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-24 23:12:38 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-30 12:15:19 +0000 |
| commit | eae62710abb46e83376d38c259b98a2778a5bb72 (patch) | |
| tree | 45b42446a42a7933baf559e1c10160b978730602 | |
| parent | f0b294e013105f93829a510b6540a7f4adce082c (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/1863
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 56ed5c39914a..022a966bad2e 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -690,7 +690,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, |