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

[Laurent Balland-Poirier]

 xmloff/source/style/xmlnumfe.cxx |    3 +++
 xmloff/source/style/xmlnumfi.cxx |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 18be99af0b2a9ad6d7303ba6e594774b4292c316
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Wed Oct 28 16:17:23 2015 +0100

    tdf#93296 dashes in decimal part => 0 min decimal places
    
    During import, as well during export, "0.--" must be considered
    as 0 min decimal places
    
    Change-Id: I33d06dd95c0678660bc0bb222972f82ef54f2c6e
    Reviewed-on: https://gerrit.libreoffice.org/19647
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 3f970cf247ad96d1663462acb0be7f1c767d1ebf)
    Reviewed-on: https://gerrit.libreoffice.org/19781

diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 6c9d360..0d160ad 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -1206,7 +1206,10 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                     if ( bExpFound && pElemStr )
                         nExpDigits += pElemStr->getLength();
                     else if ( !bDecDashes && pElemStr && (*pElemStr)[0] == '-' )
+                    {
                         bDecDashes = true;
+                        nMinDecimals = 0;
+                    }
                     else if ( !bInInteger && pElemStr )
                     {
                         for ( sal_Int32 i = pElemStr->getLength()-1; i >= 0 && (*pElemStr)[i] == '#'; i-- )
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index e9e25f4..4b01d13 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1021,7 +1021,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport,
     }
     if ( aNumInfo.nMinDecimalDigits == -1)
     {
-        if ( bVarDecimals )
+        if ( bVarDecimals || aNumInfo.bDecReplace )
             aNumInfo.nMinDecimalDigits = 0;
         else
             aNumInfo.nMinDecimalDigits = aNumInfo.nDecimals;