[Libreoffice-commits] core.git: oox/source

[Muthu Subramanian]

 oox/source/drawingml/textcharacterpropertiescontext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19abfaffe74b925e4428943d14187a7008797982
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Fri Mar 14 15:31:53 2014 +0530

    n#862510: Ignore baseline attributes with zero.
    
    Change-Id: I1adc46e62c82c23645ccad0e11d5a7cb07114539

diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index b432c80..5bb800c 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -53,7 +53,7 @@ TextCharacterPropertiesContext::TextCharacterPropertiesContext(
         mrTextCharacterProperties.moUnderline = rAttribs.getToken( XML_u );
     if ( rAttribs.hasAttribute( XML_strike ) )
         mrTextCharacterProperties.moStrikeout = rAttribs.getToken( XML_strike );
-    if ( rAttribs.hasAttribute( XML_baseline ) )
+    if ( rAttribs.hasAttribute( XML_baseline ) && rAttribs.getInteger( XML_baseline ).get() != 0 )
         mrTextCharacterProperties.moBaseline = rAttribs.getInteger( XML_baseline );
 
     if ( rAttribs.hasAttribute( XML_b ) )