diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-12-09 12:26:45 +0000 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-12-09 15:56:34 +0000 |
| commit | 653535729c9690d6d5e05e4e829e917072840e40 (patch) | |
| tree | 7146da5e1e580a4643e168ec0e332e30e78ee742 /oox | |
| parent | b832d7019f7e7499f5fb3da5d5f49ddbf0f35585 (diff) | |
tdf#104445: PPTX import: Extra bullets are added to placeholder text
Reviewed-on: https://gerrit.libreoffice.org/31771
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit cb598029835477326b190bc99abd31a487cc5a91)
Change-Id: I25ce98ed391f70292bed6238645b121b9cf50d5e
Reviewed-on: https://gerrit.libreoffice.org/31788
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textbody.cxx | 4 | ||||
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx index 662a52fd0113..8efb70d1cdd0 100644 --- a/oox/source/drawingml/textbody.cxx +++ b/oox/source/drawingml/textbody.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "drawingml/textparagraph.hxx" #include "oox/helper/propertyset.hxx" +#include <oox/token/properties.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -110,10 +111,11 @@ void TextBody::ApplyStyleEmpty( { Reference< XPropertySet > xProps(xText, UNO_QUERY); PropertyMap aioBulletList; + aioBulletList.setProperty< sal_Int32 >(PROP_LeftMargin, 0); // Init bullets left margin to 0 (no bullets). float nCharHeight = xProps->getPropertyValue("CharHeight").get<float>(); TextParagraphProperties aParaProp; aParaProp.apply(*pTextParagraphStyle); - aParaProp.pushToPropSet(&rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), false, nCharHeight, true); + aParaProp.pushToPropSet(&rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), true, nCharHeight, true); } } diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 08e2df86150c..80a056e1a899 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -352,7 +352,7 @@ void PPTShape::addShape( } // Apply text properties on placeholder text inside this placeholder shape - if (mpPlaceholder.get() != nullptr && getTextBody() && getTextBody()->isEmpty()) + if (meShapeLocation == Slide && mpPlaceholder.get() != nullptr && getTextBody() && getTextBody()->isEmpty()) { Reference < XText > xText(mxShape, UNO_QUERY); if (xText.is()) |