diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-14 16:19:50 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-14 16:50:19 +0100 |
| commit | a6278bc3a9a7de6de5802fc4cbceb739bc0720d6 (patch) | |
| tree | 977ddf160e0c4faac1ccf2056ce2c4e9576d3778 /include | |
| parent | 1e3e7b077f708aefd2e866eca85abc822ae4cd02 (diff) | |
drawingML import: fix inheritance of character height
The problem was that in case a shape had multiple (e.g. two) paragraphs,
and in case the first paragraph had an explicit character height, but
not the second, then the cursor carried over the explicit character
height to the second paragraph, but it shouldn't, as that leads to
incorrect character height in the second paragraph.
Fix this by remembering the default character height and using that in
case nothing is set explicitly.
Change-Id: I66e06d5cf192739fb254f7280c74617171d9ee6a
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/textfield.hxx | 3 | ||||
| -rw-r--r-- | include/oox/drawingml/textparagraph.hxx | 3 | ||||
| -rw-r--r-- | include/oox/drawingml/textrun.hxx | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/oox/drawingml/textfield.hxx b/include/oox/drawingml/textfield.hxx index e191c7dcafdb..4a2791836438 100644 --- a/include/oox/drawingml/textfield.hxx +++ b/include/oox/drawingml/textfield.hxx @@ -45,7 +45,8 @@ public: const ::oox::core::XmlFilterBase& rFilterBase, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > &xAt, - const TextCharacterProperties& rTextCharacterStyle ) const; + const TextCharacterProperties& rTextCharacterStyle, + float nDefaultCharHeight) const; private: TextParagraphProperties maTextParagraphProperties; diff --git a/include/oox/drawingml/textparagraph.hxx b/include/oox/drawingml/textparagraph.hxx index add0cef0ba4e..f100458ab07c 100644 --- a/include/oox/drawingml/textparagraph.hxx +++ b/include/oox/drawingml/textparagraph.hxx @@ -54,7 +54,8 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > &xAt, const TextCharacterProperties& rTextStyleProperties, const TextListStyle& rTextListStyle, - bool bFirst = false ) const; + bool bFirst = false, + float nDefaultCharHeight = 0) const; private: TextParagraphProperties maProperties; diff --git a/include/oox/drawingml/textrun.hxx b/include/oox/drawingml/textrun.hxx index 9c925f030ef5..5fec1a316db5 100644 --- a/include/oox/drawingml/textrun.hxx +++ b/include/oox/drawingml/textrun.hxx @@ -45,7 +45,8 @@ public: const ::oox::core::XmlFilterBase& rFilterBase, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText >& xText, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor >& xAt, - const TextCharacterProperties& rTextCharacterStyle ) const; + const TextCharacterProperties& rTextCharacterStyle, + float nDefaultCharHeight) const; private: OUString msText; |