diff options
| author | Eike Rathke <erack@redhat.com> | 2018-07-10 18:39:32 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-07-10 18:40:13 +0200 |
| commit | 8ca6468f0f4900d4d3bb45e0e938fe35c308512c (patch) | |
| tree | 1fff546c6b05469af901e268ac879e84c5b98748 /include/xmloff | |
| parent | edc62adae9a354ca1305e83b10c98a545f58d341 (diff) | |
Revert "tdf#118324 Extend ODF for blank in integer"
This reverts commit c290f692dd28094d41dff686f3faa1c4e14b556e.
Reverting because
a) makes builds fail with errors from the schema validator in saving unit tests
b) the loext:max-blank-integer-digits is now saved for some number formats where it is not necessary
For example, load sc/qa/unit/data/ods/tdf102370_ExponentWithoutSign.ods
save as .xlsx
reload the .xlsx
save as .ods
(which effectively is what the ScExportTest::testExponentWithoutSignFormatXLSX() unit test does and makes the schema validator stumble)
Change-Id: Iaac7e42b23317e7977876c9b5d545c76a1e2a4d2
Reviewed-on: https://gerrit.libreoffice.org/57240
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/xmlnumfi.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index b52136b8d677..75c3b133c036 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -64,12 +64,12 @@ private: SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor ); SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, sal_Int32 nMinDecimals, - sal_Int32 nInteger, sal_Int32 nBlankInteger, const OUString& rDashStr, + sal_Int32 nInteger, const OUString& rDashStr, bool bGrouping, sal_Int32 nTrailingThousands, const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries ); - SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, sal_Int32 nMinDecimals, sal_Int32 nInteger, sal_Int32 nBlankInteger, + 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, sal_Int32 nBlankInteger, bool bGrouping, + SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, bool bGrouping, const SvNumberformat& rFormat, sal_uInt16 nPart ); SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString, const OUString& rExt ); diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index 7e01f6afb4f3..39d058fbaeed 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -157,7 +157,7 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext public: SvXMLNumFormatContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 017af65a526b..862741d0a0eb 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3316,7 +3316,6 @@ namespace xmloff { namespace token { XML_ZEROS_NUMERATOR_DIGITS, XML_ZEROS_DENOMINATOR_DIGITS, XML_INTEGER_FRACTION_DELIMITER, - XML_MAX_BLANK_INTEGER_DIGITS, // tdf#115319 XML_REFERENCE_LANGUAGE, |