summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@collabora.com>2013-12-12 18:24:42 +0530
committerMuthu Subramanian <sumuthu@collabora.com>2013-12-18 20:20:49 +0530
commitc0dd1682420f0e9e18a74a0ec5fd02b029573c80 (patch)
tree16307ab41e6e63fef439ef3f3f132726b78a6e02
parent1d42520a36bb2a3131330e03e7f25d4ae5a99241 (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() ) {