diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-24 18:32:11 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-09 09:17:36 +0200 |
| commit | 7c20c3c2a9fc85c66dad9d09908b257beeedd78d (patch) | |
| tree | 84d07d36ea2c72df61afa031657db2535da363a0 /xmloff/source/style/xmlnumfe.cxx | |
| parent | 21ac2dae6a84b2c686abdbefb5d9bd10fed42680 (diff) | |
xmloff: ODF export: adapt all checks of ODFSVER_012 etc.
Most of these actually want to check ODFSVER_EXTENDED because the
extension didn't get into ODF 1.3.
Change-Id: I1b625a329f7a3d146c616c62c15b56e2c314c2c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92872
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
Diffstat (limited to 'xmloff/source/style/xmlnumfe.cxx')
| -rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index d17266d5f15a..178815c54316 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -743,7 +743,7 @@ void SvXMLNumFmtExport::WriteFractionElement_Impl( SvtSaveOptions::ODFSaneDefaultVersion eVersion = rExport.getSaneDefaultVersion(); if ( !aIntegerFractionDelimiterString.isEmpty() && aIntegerFractionDelimiterString != " " && ((eVersion & SvtSaveOptions::ODFSVER_EXTENDED) != 0) ) - { // Export only for 1.2 with extensions or 1.3 and later. + { // Export only for 1.2/1.3 with extensions. rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_INTEGER_FRACTION_DELIMITER, aIntegerFractionDelimiterString ); } @@ -753,7 +753,7 @@ void SvXMLNumFmtExport::WriteFractionElement_Impl( nMinNumeratorDigits++; rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_NUMERATOR_DIGITS, OUString::number( nMinNumeratorDigits ) ); - // Export only for 1.2 with extensions or 1.3 and later. + // Export only for 1.2/1.3 with extensions. if ((eVersion & SvtSaveOptions::ODFSVER_EXTENDED) != 0) { // For extended ODF use loext namespace @@ -1211,9 +1211,9 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt LanguageTag aLanguageTag( aAttr.Locale); OUString aLanguage, aScript, aCountry; aLanguageTag.getIsoLanguageScriptCountry( aLanguage, aScript, aCountry); - // 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), + // For 1.2/1.3+ use loext namespace. + rExport.AddAttribute( /*((eVersion < SvtSaveOptions::ODFSVER_) + ? */ XML_NAMESPACE_LO_EXT /*: XML_NAMESPACE_NUMBER)*/, XML_TRANSLITERATION_SPELLOUT, aAttr.Spellout ); rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_TRANSLITERATION_LANGUAGE, aLanguage ); |