diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-24 16:56:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-25 20:05:30 +0200 |
| commit | 134f40136a9bea265d8f2fedfdb41a1e65d81b49 (patch) | |
| tree | d00db8e5b8cc954440228b8815631aa937effdca /xmloff | |
| parent | 28993c0a8d8628c650b661767fd8ab2228c507d9 (diff) | |
use officecfg to retrieve OdfDefaultVersion
Change-Id: Id54b98d978965e7ce304b83d5eff7d6c844a41d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119474
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/style/xmlexppr.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index d73783994271..3159aa44e683 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -261,7 +261,6 @@ public: uno::Reference< embed::XStorage > mxTargetStorage; - SvtSaveOptions maSaveOptions; std::optional<SvtSaveOptions::ODFSaneDefaultVersion> m_oOverrideODFVersion; /// name of stream in package, e.g., "content.xml" @@ -430,7 +429,7 @@ void SvXMLExport::DetermineModelType_() xModule->getIdentifier() == "com.sun.star.sdb.FormDesign"); if (isBaseForm) { - switch (mpImpl->maSaveOptions.GetODFSaneDefaultVersion()) + switch (GetODFSaneDefaultVersion()) { case SvtSaveOptions::ODFSVER_013_EXTENDED: SAL_INFO("xmloff.core", "tdf#138209 force form export to ODF 1.2"); @@ -2327,7 +2326,7 @@ SvtSaveOptions::ODFSaneDefaultVersion SvXMLExport::getSaneDefaultVersion() const { return *mpImpl->m_oOverrideODFVersion; } - return mpImpl->maSaveOptions.GetODFSaneDefaultVersion(); + return GetODFSaneDefaultVersion(); } void diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 44bab345afe2..a2d9aa546190 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -548,7 +548,7 @@ vector<XMLPropertyState> SvXMLExportPropertyMapper::Filter_( bool bDelInfo = false; if( !pFilterInfo ) { - assert(SvtSaveOptions().GetODFDefaultVersion() != SvtSaveOptions::ODFVER_UNKNOWN); + assert(GetODFDefaultVersion() != SvtSaveOptions::ODFVER_UNKNOWN); const SvtSaveOptions::ODFSaneDefaultVersion nCurrentVersion(rExport.getSaneDefaultVersion()); pFilterInfo = new FilterPropertiesInfo_Impl; for( sal_Int32 i=0; i < nProps; i++ ) |