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

[Eike Rathke]

 xmloff/source/style/xmlnumfi.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cdb2d6aa33a409994c3033cf621847d1552ce8cd
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jul 10 23:20:28 2015 +0200

    the last condition is "all other numbers", not the third, tdf#92457 related
    
    (cherry picked from commit b3c11e2b3ef4bad8c2b5f92ba00ac805fb68786f)
    
    So we'll properly strip the "value()<=1.79769313486232E+308"
    condition that 5.1 will write.
    
    This will not enable the handling of the style, but at least it is fed
    correctly as intended to the number formatter.
    
    Change-Id: Ic9571d938c4a8837c5712bafbfb2ebf9f32011df
    Reviewed-on: https://gerrit.libreoffice.org/16990
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 6c84c5a..99b030d 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -2060,10 +2060,10 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
         if ( aConditions.isEmpty() && aMyConditions.size() == 1 && sRealCond.equalsAscii( ">=0" ) )
             bDefaultCond = true;
 
-        if ( nType == XML_TOK_STYLES_TEXT_STYLE && nIndex == 2 )
+        if ( nType == XML_TOK_STYLES_TEXT_STYLE && static_cast<size_t>(nIndex) == aMyConditions.size() - 1 )
         {
-            //  The third condition in a number format with a text part can only be
-            //  "all other numbers", the condition string must be empty.
+            //  The last condition in a number format with a text part can only
+            //  be "all other numbers", the condition string must be empty.
             bDefaultCond = true;
         }