summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@collabora.com>2013-12-12 18:24:42 +0530
committerAndras Timar <andras.timar@collabora.com>2014-01-03 11:25:41 +0100
commitc8f4d9b98228d241d3798ce839b3553a2708c36b (patch)
tree1cc7929df32c67133774b8d5cfa8643686f9c3d7
parentcd793642b76d69155e581f3d7df049c08a4195ee (diff)
n#828390: Reset charescapement.
Unless the value is reset - the escapement seems to continue to the next set of textruns.
-rw-r--r--oox/source/drawingml/textcharacterproperties.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 4230148477a5..c531bc16d7ec 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -129,6 +129,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() ) {