diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-24 18:30:12 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-12 12:56:36 +0200 |
| commit | 816022a4d8a1878c8ea74f43a4821e3c8a12d1ea (patch) | |
| tree | f1994b46d28e39de3ada2438cdf180eb550bac80 /xmloff/source/style | |
| parent | 1237acf9851f8b12d1ccd929e2aa8b184c06d552 (diff) | |
xmloff: ODF export: adapt to ODF 1.3
* OFFICE-3883 legend svg:width/svg:height
* OFFICE-3928 chart:coordinate-region
* OFFICE-3943 draw:mime-type
* OFFICE-3765 number:fill-character, number:text
* OFFICE-3860 number:min-decimal-places, number:forced-exponent-sign
* OFFICE-1828 number:exponent-interval
* OFFICE-3695 number:max-denominator-value
* OFFICE-3941 text:index-entry-link-start/text:index-entry-link-end
* OFFICE-3776 meta:creator-initials
* OFFICE-3789 style:header-first/style:footer-first
Change-Id: I78c79231c0708c3ae9943097d162898fab71988f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92873
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'xmloff/source/style')
| -rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 178815c54316..9b844eda3a24 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -492,8 +492,8 @@ void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar ) SvtSaveOptions::ODFSaneDefaultVersion eVersion = rExport.getSaneDefaultVersion(); if (eVersion > SvtSaveOptions::ODFSVER_012) { - FinishTextElement_Impl(true); - // For 1.2+ use loext namespace, for 1.3 use number namespace. + FinishTextElement_Impl(eVersion < SvtSaveOptions::ODFSVER_013); + // OFFICE-3765 For 1.2+ use loext namespace, for 1.3 use number namespace. SvXMLElementExport aElem( rExport, ((eVersion < SvtSaveOptions::ODFSVER_013) ? XML_NAMESPACE_LO_EXT : XML_NAMESPACE_NUMBER), XML_FILL_CHARACTER, true, false ); @@ -547,7 +547,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl( SvtSaveOptions::ODFSaneDefaultVersion eVersion = rExport.getSaneDefaultVersion(); if (eVersion > SvtSaveOptions::ODFSVER_012) { - // For 1.2+ use loext namespace, for 1.3 use number namespace. + // OFFICE-3860 For 1.2+ use loext namespace, for 1.3 use number namespace. rExport.AddAttribute( ((eVersion < SvtSaveOptions::ODFSVER_013) ? XML_NAMESPACE_LO_EXT : XML_NAMESPACE_NUMBER), XML_MIN_DECIMAL_PLACES, @@ -636,7 +636,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl( // Export only for 1.2 with extensions or 1.3 and later. if (eVersion > SvtSaveOptions::ODFSVER_012) { - // For 1.2+ use loext namespace, for 1.3 use number namespace. + // OFFICE-3860 For 1.2+ use loext namespace, for 1.3 use number namespace. rExport.AddAttribute( ((eVersion < SvtSaveOptions::ODFSVER_013) ? XML_NAMESPACE_LO_EXT : XML_NAMESPACE_NUMBER), XML_MIN_DECIMAL_PLACES, @@ -670,7 +670,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl( // Export only for 1.2 with extensions or 1.3 and later. if (eVersion > SvtSaveOptions::ODFSVER_012) { - // For 1.2+ use loext namespace, for 1.3 use number namespace. + // OFFICE-1828 For 1.2+ use loext namespace, for 1.3 use number namespace. rExport.AddAttribute( ((eVersion < SvtSaveOptions::ODFSVER_013) ? XML_NAMESPACE_LO_EXT : XML_NAMESPACE_NUMBER), XML_EXPONENT_INTERVAL, OUString::number( nExpInterval ) ); @@ -681,7 +681,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl( // Export only for 1.2 with extensions or 1.3 and later. if (eVersion > SvtSaveOptions::ODFSVER_012) { - // For 1.2+ use loext namespace, for 1.3 use number namespace. + // OFFICE-3860 For 1.2+ use loext namespace, for 1.3 use number namespace. rExport.AddAttribute( ((eVersion < SvtSaveOptions::ODFSVER_013) ? XML_NAMESPACE_LO_EXT : XML_NAMESPACE_NUMBER), XML_FORCED_EXPONENT_SIGN, @@ -779,7 +779,7 @@ void SvXMLNumFmtExport::WriteFractionElement_Impl( OUString::number( nMinDenominatorDigits ) ); if (eVersion > SvtSaveOptions::ODFSVER_012) { - // For 1.2+ use loext namespace, for 1.3 use number namespace. + // OFFICE-3695 For 1.2+ use loext namespace, for 1.3 use number namespace. rExport.AddAttribute( ((eVersion < SvtSaveOptions::ODFSVER_013) ? XML_NAMESPACE_LO_EXT : XML_NAMESPACE_NUMBER), XML_MAX_DENOMINATOR_VALUE, |