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

Stephan Bergmann sbergman at redhat.com
Tue Jul 1 05:00:02 PDT 2014


 xmloff/source/text/txtstyli.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b398f8157699030061dde88d967364bedd5b2a52
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 1 13:58:25 2014 +0200

    -Werror,-Wtautological-constant-out-of-range-compare
    
    Looks like 7d9bb549d498d6beed2c4050c402d09643febdfa "Related: #i124638# Second
    step of DrawingLayer FillAttributes..." accidentally garbled this.
    
    Change-Id: I4cdaad4fdebb8b9947e79afbec4a6e0973c55cac

diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index b6db591..7788331 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -516,7 +516,7 @@ void XMLTextStyleContext::FillPropertySet(
                 (aContextIDs[1].nIndex == -1) ? makeAny( false ) : GetProperties()[aContextIDs[1].nIndex].maValue );
         }
 
-        if(XML_STYLE_FAMILY_TABLE_TABLE == IsDefaultStyle() && GetFamily())
+        if(IsDefaultStyle() && XML_STYLE_FAMILY_TABLE_TABLE == GetFamily())
         {
             OUString sCollapsingBorders("CollapsingBorders");
             DBG_ASSERT( rPropSet->getPropertySetInfo()->hasPropertyByName( sCollapsingBorders ), "property missing?" );


More information about the Libreoffice-commits mailing list