From 3f970cf247ad96d1663462acb0be7f1c767d1ebf Mon Sep 17 00:00:00 2001 From: Laurent Balland-Poirier Date: Wed, 28 Oct 2015 16:17:23 +0100 Subject: 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 Tested-by: Eike Rathke --- xmloff/source/style/xmlnumfe.cxx | 3 +++ xmloff/source/style/xmlnumfi.cxx | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'xmloff/source') diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 2d6043d0d54a..6801d3c05fbf 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -1201,7 +1201,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 eca9301e83c5..c375a78824ef 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1006,7 +1006,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport, } if ( aNumInfo.nMinDecimalDigits == -1) { - if ( bVarDecimals ) + if ( bVarDecimals || aNumInfo.bDecReplace ) aNumInfo.nMinDecimalDigits = 0; else aNumInfo.nMinDecimalDigits = aNumInfo.nDecimals; -- cgit v1.2.1