[PATCH] Change in core[libreoffice-4-0]: fdo#58204: PPT export: fix text rotation in shapes:

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1862

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/1862/1

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
---
M filter/source/msfilter/escherex.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index cdf7295..69b7b4c 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -682,7 +682,9 @@
 
     // 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,

-- 
To view, visit https://gerrit.libreoffice.org/1862
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>