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

[Laurent Balland-Poirier]

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

New commits:
commit 1f599fb158d5a94128e9eb28b6787f5116df9e8b
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Wed May 4 22:16:47 2016 +0200

    tdf#38097 min numerator/denominator at least 1
    
    In <number:fraction> attributes min-denominator-digits and
    min-numerator-digits should be at least 1.
    Gnumeric can create file with 0 values
    
    Change-Id: I08ef51c23ce686136f51277671bf630807353484
    Reviewed-on: https://gerrit.libreoffice.org/24670
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit a75aa73b2bf793faac1adb3b5f67e09d252d5fe9)
    Reviewed-on: https://gerrit.libreoffice.org/25449
    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 bb8f97f..9aac01e 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -973,11 +973,11 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport,
                     aNumInfo.bExpSign = bAttrBool;
                 break;
             case XML_TOK_ELEM_ATTR_MIN_NUMERATOR_DIGITS:
-                if (::sax::Converter::convertNumber( nAttrVal, sValue, 0 ))
+                if (::sax::Converter::convertNumber( nAttrVal, sValue, 1 ))  // at least one '?' (tdf#38097)
                     aNumInfo.nNumerDigits = nAttrVal;
                 break;
-            case XML_TOK_ELEM_ATTR_MIN_DENOMINATOR_DIGITS:
-                if (::sax::Converter::convertNumber( nAttrVal, sValue, 0 ))
+            case XML_TOK_ELEM_ATTR_MIN_DENOMINATOR_DIGITS:  // while max-denominator-digits not treated (tdf#99661)
+                if (::sax::Converter::convertNumber( nAttrVal, sValue, 1 ))  // at least one '?' (tdf#38097)
                     aNumInfo.nDenomDigits = nAttrVal;
                 break;
             case XML_TOK_ELEM_ATTR_DENOMINATOR_VALUE: