diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-21 18:57:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-12-21 18:42:11 +0100 |
| commit | 88ac99d6afb1903c4f4a6a33b92fef461979703c (patch) | |
| tree | e235b25e8e02206f106b58e70c27f00dcd4c5acf /sw | |
| parent | fa87499193bddd2bc8728532f62b1e2a91052a44 (diff) | |
replace ODFDefaultVersion usage with ODFSaneDefaultVersion
Compare with ODFSVER_012 mostly works the same, except for places where
namespaces are defined where the ODFSVER_EXTENDED bit should be checked.
Conflicts:
sc/source/filter/xml/XMLExportDataPilot.cxx
xmloff/source/chart/SchXMLExport.cxx
Change-Id: I86469b763bc2f903632976bc9d6ec04d543d705e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108107
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/number.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlexp.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 37156ac40e83..f592be0c7d07 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1477,15 +1477,15 @@ namespace numfunc SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode; SvtSaveOptions aSaveOptions; - switch ( aSaveOptions.GetODFDefaultVersion() ) + switch (aSaveOptions.GetODFSaneDefaultVersion()) { - case SvtSaveOptions::ODFVER_010: - case SvtSaveOptions::ODFVER_011: + case SvtSaveOptions::ODFSVER_010: + case SvtSaveOptions::ODFSVER_011: { ePosAndSpaceMode = SvxNumberFormat::LABEL_WIDTH_AND_POSITION; } break; - default: // ODFVER_UNKNOWN or ODFVER_012 + default: // >= ODFSVER_012 { ePosAndSpaceMode = SvxNumberFormat::LABEL_ALIGNMENT; } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 28745ab2f023..366ee6547c5b 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -133,7 +133,7 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) if( getExportFlags() & (SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::STYLES| SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT)) { - if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) + if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012) { GetNamespaceMap_().Add( GetXMLToken(XML_NP_OFFICE_EXT), |