diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-15 23:18:03 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-11-26 20:33:54 +0000 |
commit | f75d03bd90b27034a69c47f5413ec013dafc97c6 (patch) | |
tree | e1b41e141eab9cec714a57427881b807a74770e4 /oox/source/ppt/pptshape.cxx | |
parent | 6c705826f506fe17b5191ee897b758843bcf5529 (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>
(cherry picked from commit 5c7f3e4a7190bf9821bed102f96a926c9a894e59)
Reviewed-on: https://gerrit.libreoffice.org/30940
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'oox/source/ppt/pptshape.cxx')
-rw-r--r-- | oox/source/ppt/pptshape.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index ad02b2d672f3..f60f929a04cf 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -349,6 +349,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 |