[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source
Muthu Subramanian
sumuthu at collabora.com
Thu Jun 26 06:13:05 PDT 2014
oox/source/drawingml/textcharacterproperties.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit ad9a48a2b31fc97bcfbf50b8f5731f520c281595
Author: Muthu Subramanian <sumuthu at collabora.com>
Date: Thu Dec 12 18:24:42 2013 +0530
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 at collabora.com>
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index a7be42b..8364c86 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() ) {
More information about the Libreoffice-commits
mailing list