diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2015-04-03 11:59:37 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-04-28 00:19:02 +0000 |
| commit | 4fee05e680217e876210b341f904df9441a0b7cd (patch) | |
| tree | 882df2fd9831a386d1a44ce3a90d7c0d512ead28 /include/xmloff | |
| parent | 38992b419a4655eba9b85d337edbb208fd2fff95 (diff) | |
tdf#90133 Extend ODF: variable decimal in scientific format
Variable decimal is only saved in ODF for number, and do not consider
partial variable decimal: 0.0## is saved as 0.000
This patch extend ODF with loext:min-decimal-digit for number format and
scientific format
Change-Id: I5022458da47bbd33c3e195c280e75c43faca5f8d
Reviewed-on: https://gerrit.libreoffice.org/15135
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/xmlnumfe.hxx | 6 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index 1f4198a738c5..9a770a173843 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -62,11 +62,11 @@ private: SAL_DLLPRIVATE void FinishTextElement_Impl(bool bUseExtensionNS = false); SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor ); - SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger, - const OUString& rDashStr, bool bVarDecimals, + SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, sal_Int32 nMinDecimals, + sal_Int32 nInteger, const OUString& rDashStr, bool bGrouping, sal_Int32 nTrailingThousands, const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries ); - SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger, + SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, sal_Int32 nMinDecimals, sal_Int32 nInteger, bool bGrouping, sal_Int32 nExp, sal_Int32 nExpInterval, bool bExpSign ); SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, bool bGrouping, sal_Int32 nNumeratorDigits, sal_Int32 nDenominatorDigits, sal_Int32 nDenominator ); diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index af2fcdbcaa18..5b0167116dbc 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3251,6 +3251,7 @@ namespace xmloff { namespace token { XML_EXPONENT_INTERVAL, XML_EXPONENT_SIGN, + XML_MIN_DECIMAL_DIGITS, XML_TOKEN_END }; |