[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - oox/source

[Muthu Subramanian]

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

New commits:
commit 88faa076da606e8611aea4c4b2d10fee694943a5
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Fri Mar 14 20:03:45 2014 +0530

    n#862510: Ignore baseline attributes with zero.
    
    Ported from 19abfaffe74b925e4428943d14187a7008797982
    
    Change-Id: I5447c16193f7c3e619ce10658c9696014d3d5a22

diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 19b54c6..6835149 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -55,7 +55,7 @@ TextCharacterPropertiesContext::TextCharacterPropertiesContext(
         mrTextCharacterProperties.moUnderline = aAttribs.getToken( XML_u );
     if ( aAttribs.hasAttribute( XML_strike ) )
         mrTextCharacterProperties.moStrikeout = aAttribs.getToken( XML_strike );
-    if ( aAttribs.hasAttribute( XML_baseline ) )
+    if ( aAttribs.hasAttribute( XML_baseline ) && aAttribs.getInteger( XML_baseline ).get() != 0 )
         mrTextCharacterProperties.moBaseline = aAttribs.getInteger( XML_baseline );
     if( aAttribs.hasAttribute( XML_cap ) )
         mrTextCharacterProperties.moCaseMap = aAttribs.getToken( XML_cap );