diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-17 11:21:02 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-02 13:27:01 +0000 |
| commit | 3d9e1d16b884417ec892f67da625cf02d897f2cc (patch) | |
| tree | a955e3cf4aaa98a20760457e4f5e5cb8df71aa99 /oox | |
| parent | e4f50efd000734c8259ed2915bf0dd1c71700ceb (diff) | |
tdf#90407: Export Text AutoFit to .pptx
Change-Id: I2120f13fff58d4736ab55071236e0c2f80ba2eb0
(cherry picked from commit 7277991e78c264025b4894ae07b40fb12cd57ce6)
Reviewed-on: https://gerrit.libreoffice.org/34374
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 83e0e1af6ef8..d6751a23392f 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -50,6 +50,7 @@ #include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/XShape.hpp> @@ -82,11 +83,11 @@ #include <editeng/svxenum.hxx> #include <editeng/unonames.hxx> #include <editeng/flditem.hxx> -#include <svx/unoapi.hxx> +#include <svx/sdtfsitm.hxx> #include <svx/svdoashp.hxx> +#include <svx/unoapi.hxx> #include <svx/unoshape.hxx> - using namespace ::css; using namespace ::css::beans; using namespace ::css::drawing; @@ -2171,6 +2172,14 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin GET(bTextAutoGrowHeight, TextAutoGrowHeight); mpFS->singleElementNS(XML_a, (bTextAutoGrowHeight ? XML_spAutoFit : XML_noAutofit), FSEND); } + if (GetDocumentType() == DOCUMENT_PPTX) + { + TextFitToSizeType eFit = TextFitToSizeType_NONE; + if (GETA(TextFitToSize)) + mAny >>= eFit; + if (eFit == TextFitToSizeType_AUTOFIT) + mpFS->singleElementNS(XML_a, XML_normAutofit, FSEND); + } mpFS->endElementNS((nXmlNamespace ? nXmlNamespace : XML_a), XML_bodyPr); } |