summaryrefslogtreecommitdiff
path: root/oox/source/ppt
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2016-11-15 23:18:03 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2016-11-17 18:01:13 +0000
commit5c7f3e4a7190bf9821bed102f96a926c9a894e59 (patch)
tree47427568c32998a130c012870f14be00591c828d /oox/source/ppt
parent6b35e804198ac45386805e80a3d413ed3405c3b4 (diff)
tdf#103876: PPTX import: Title shape's character properties are wrong
Text properties are applied on a shape during text insertion, but if a placeholder shape has no text, then it has a placehodler text which should have the right text properties. Change-Id: I54175d52dd25915ee4d7153298e01ec07c6be1f6 Reviewed-on: https://gerrit.libreoffice.org/30881 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox/source/ppt')
-rw-r--r--oox/source/ppt/pptshape.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 18a256595ae8..08e2df86150c 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -350,6 +350,17 @@ void PPTShape::addShape(
}
}
+
+ // Apply text properties on placeholder text inside this placeholder shape
+ if (mpPlaceholder.get() != nullptr && getTextBody() && getTextBody()->isEmpty())
+ {
+ Reference < XText > xText(mxShape, UNO_QUERY);
+ if (xText.is())
+ {
+ TextCharacterProperties aCharStyleProperties;
+ getTextBody()->ApplyStyleEmpty(rFilterBase, xText, aCharStyleProperties, mpMasterTextListStyle);
+ }
+ }
if (pShapeMap)
{
// bnc#705982 - if optional model id reference is