diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-21 18:57:52 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-07 19:01:01 +0200 |
| commit | 45f2e81c98a5b7fe6f021923fd93d20b3c5f3815 (patch) | |
| tree | 21bd3ac8aeeb7fef7c88c59c02fdb1ad7d2366b3 /sw | |
| parent | 6ba74150866d71469827de9f4f19268dfa7db137 (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.
Change-Id: I86469b763bc2f903632976bc9d6ec04d543d705e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92727
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
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 cfa140a58817..0c7810f058f4 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1439,15 +1439,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 86892a84dc00..f966da56d26e 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -125,7 +125,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), |