[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - xmloff/source

[Caolán McNamara]

 xmloff/source/draw/XMLNumberStyles.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 88b1ca64c0cdb426025b246618e7e9e880c286d8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 2 11:06:12 2018 +0000

    ofz#6656 -1 isn't a good flag for all elements filled
    
    Change-Id: I163de8fd943859fbf986da0928f3e3552d063a09
    Reviewed-on: https://gerrit.libreoffice.org/50626
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 8ca660499cc6..23ce723ec021 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -603,11 +603,8 @@ SdXMLNumberFormatImportContext::~SdXMLNumberFormatImportContext()
 
 void SdXMLNumberFormatImportContext::add( OUString& rNumberStyle, bool bLong, bool bTextual, bool   bDecimal02, OUString& rText )
 {
-    if( mnIndex == -1 || mnIndex == 16 )
-    {
-        mnIndex = -1;
+    if (mnIndex == 16)
         return;
-    }
 
     const SdXMLDataStyleNumber* pStyleMember = aSdXMLDataStyleNumbers;
     for( sal_uInt8 nIndex = 0; pStyleMember->meNumberStyle != XML_TOKEN_INVALID; nIndex++, pStyleMember++ )