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 /xmloff/source/draw/sdxmlexp.cxx | |
| 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 'xmloff/source/draw/sdxmlexp.cxx')
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 03c769cce1a4..2432d0756c07 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -553,7 +553,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent GetXMLToken(XML_N_ANIMATION), XML_NAMESPACE_ANIMATION); - if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) + if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) { GetNamespaceMap_().Add( GetXMLToken(XML_NP_OFFICE_EXT), @@ -1996,7 +1996,7 @@ void SdXMLExport::ExportStyles_(bool bUsed) GetShapeExport()->ExportGraphicDefaults(); // do not export in ODF 1.1 or older - if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + if (getSaneDefaultVersion() >= SvtSaveOptions::ODFSVER_012) GetShapeExport()->GetShapeTableExport()->exportTableStyles(); // write presentation styles @@ -2500,7 +2500,7 @@ void SdXMLExport::collectAnnotationAutoStyles( const Reference<XDrawPage>& xDraw void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) { // do not export in ODF 1.2 or older - if( getDefaultVersion() <= SvtSaveOptions::ODFVER_012 ) + if (getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012) return; Reference< XAnnotationAccess > xAnnotationAccess( xDrawPage, UNO_QUERY ); |