diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2016-07-16 22:39:32 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-07-27 13:12:34 +0000 |
| commit | f06a3503b69819e1d018ee4f587655173dff503e (patch) | |
| tree | 77e6c699e349bd518f87c824388c6e3dfecb122d /include | |
| parent | 5bd8b05f9b0adb93aec4d6ad7b67c7003092b873 (diff) | |
tdf#100834 Extend ODF for integer/fraction delimiter
Any string can be used as delimiter between integer and fraction.
It is now saved/loaded to/from ODF, as it was from XLS.
Change-Id: Ie6364d1cdefc020ea615c18099118135c619f96b
Reviewed-on: https://gerrit.libreoffice.org/27262
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/zformat.hxx | 1 | ||||
| -rw-r--r-- | include/xmloff/xmlnumfe.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index ab82bcc23313..57245a94b812 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -251,6 +251,7 @@ public: OUString GetDenominatorString( sal_uInt16 nNumFor ) const; OUString GetNumeratorString( sal_uInt16 nNumFor ) const; + OUString GetIntegerFractionDelimiterString( sal_uInt16 nNumFor ) const; /** If the count of string elements (substrings, ignoring [modifiers] and so on) in a subformat code nNumFor (0..3) is equal to the given number. Used by ImpSvNumberInputScan::IsNumberFormatMain() to detect a matched diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index be72e4b3ac98..c04b8e42e789 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -70,7 +70,7 @@ private: 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, - const OUString& aNumeratorString, const OUString& aDenominatorString ); + const SvNumberformat& rFormat, sal_uInt16 nPart ); SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString, const OUString& rExt ); SAL_DLLPRIVATE void WriteBooleanElement_Impl(); diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index aa462c3e0434..0a565917981b 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3271,6 +3271,7 @@ namespace xmloff { namespace token { XML_MAX_NUMERATOR_DIGITS, XML_ZEROS_NUMERATOR_DIGITS, XML_ZEROS_DENOMINATOR_DIGITS, + XML_INTEGER_FRACTION_DELIMITER, XML_TOKEN_END }; |