diff options
author | Muthu Subramanian <sumuthu@collabora.com> | 2013-12-12 18:24:42 +0530 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-06-26 14:28:46 +0200 |
commit | ad9a48a2b31fc97bcfbf50b8f5731f520c281595 (patch) | |
tree | 28823b3104a13d32b60ad9f2d0d34f44fb10861f /oox | |
parent | de7e9c576d35d70392228126fa2970bdcaf07c01 (diff) |
n#828390: Reset charescapement.
Unless the value is reset - the escapement
seems to continue to the next set of textruns.
(cherry picked from commit fdf77f50ab825bd2b44e980552f3383acf637b12)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/textcharacterproperties.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index a7be42be60ed..8364c86577d8 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -122,6 +122,9 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil if( moBaseline.has() ) { rPropMap[ PROP_CharEscapement ] <<= sal_Int16(moBaseline.get( 0 ) / 1000); rPropMap[ PROP_CharEscapementHeight ] <<= sal_Int8(DFLT_ESC_PROP); + } else { + rPropMap[ PROP_CharEscapement ] <<= sal_Int16(0); + rPropMap[ PROP_CharEscapementHeight ] <<= sal_Int8(100); // 100% } if( !bUseOptional || moBold.has() ) { |