From b50d1a42064c8333926166ec047d3467c83d2fd0 Mon Sep 17 00:00:00 2001 From: Balazs Varga Date: Wed, 21 Aug 2019 16:00:42 +0200 Subject: tdf#127030 PPTX export: keep fixed size of legacy shapes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Classical/legacy shapes lost their fixed size by exporting them with the option "Resize shape to fit text". Regression from commit 86b14cc8bd910651cef422a0f7408adc0fc51a17 (tdf#119617 Fix export of Autofit property of shapes to PPTX) Change-Id: Iab67db113edc61f4c94a89ec1bb8df0736c26f21 Reviewed-on: https://gerrit.libreoffice.org/77888 Reviewed-by: László Németh Tested-by: László Németh --- oox/source/export/drawingml.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'oox/source/export') diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 021a1e0b1936..d4b35c8988f6 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2794,8 +2794,9 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin } else { + // tdf#127030: Only custom shapes obey the TextAutoGrowHeight option. bool bTextAutoGrowHeight = false; - if (GetProperty(rXPropSet, "TextAutoGrowHeight")) + if (dynamic_cast(rXIface.get()) && GetProperty(rXPropSet, "TextAutoGrowHeight")) mAny >>= bTextAutoGrowHeight; mpFS->singleElementNS(XML_a, (bTextAutoGrowHeight ? XML_spAutoFit : XML_noAutofit)); } -- cgit