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 /dbaccess | |
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 'dbaccess')
-rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 554233d74f2a..9d4050736774 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1672,11 +1672,11 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( OUString(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) ) ); OUString aVersion; - SvtSaveOptions::ODFDefaultVersion const nDefVersion = - aSaveOpt.GetODFDefaultVersion(); + SvtSaveOptions::ODFSaneDefaultVersion const nDefVersion = + aSaveOpt.GetODFSaneDefaultVersion(); // older versions can not have this property set, // it exists only starting from ODF1.2 - if (nDefVersion >= SvtSaveOptions::ODFVER_012) + if (nDefVersion >= SvtSaveOptions::ODFSVER_012) aVersion = ODFVER_012_TEXT; if (!aVersion.isEmpty()) |