diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-15 23:18:03 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-17 18:01:13 +0000 |
| commit | 5c7f3e4a7190bf9821bed102f96a926c9a894e59 (patch) | |
| tree | 47427568c32998a130c012870f14be00591c828d /oox/inc | |
| parent | 6b35e804198ac45386805e80a3d413ed3405c3b4 (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/inc')
| -rw-r--r-- | oox/inc/drawingml/textbody.hxx | 8 | ||||
| -rw-r--r-- | oox/inc/drawingml/textparagraph.hxx | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx index 5f8b053cc8a8..043529723e76 100644 --- a/oox/inc/drawingml/textbody.hxx +++ b/oox/inc/drawingml/textbody.hxx @@ -59,7 +59,13 @@ public: const css::uno::Reference < css::text::XTextCursor > & xAt, const TextCharacterProperties& rTextStyleProperties, const TextListStylePtr& pMasterTextListStyle ) const; - bool isEmpty(); + bool isEmpty() const; + + void ApplyStyleEmpty( + const ::oox::core::XmlFilterBase& rFilterBase, + const css::uno::Reference < css::text::XText > & xText, + const TextCharacterProperties& rTextStyleProperties, + const TextListStylePtr& pMasterTextListStylePtr) const; protected: TextParagraphVector maParagraphs; TextBodyProperties maTextProperties; diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx index 8a02a671a5b0..337d50718ad8 100644 --- a/oox/inc/drawingml/textparagraph.hxx +++ b/oox/inc/drawingml/textparagraph.hxx @@ -53,6 +53,13 @@ public: TextCharacterProperties& getEndProperties() { return maEndProperties; } const TextCharacterProperties& getEndProperties() const { return maEndProperties; } + TextCharacterProperties getCharacterStyle( + const TextCharacterProperties& rTextStyleProperties, + const TextListStyle& rTextListStyle) const; + + TextParagraphPropertiesPtr getParagraphStyle( + const TextListStyle& rTextListStyle) const; + void insertAt( const ::oox::core::XmlFilterBase& rFilterBase, const css::uno::Reference < css::text::XText > & xText, |