From bb95d189653d73911c187227ace682ba2b98172c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 2 Jun 2020 13:14:58 +0200 Subject: tdf#133501 xmloff: ODF export: export annotation only if extended (regression from 7c20c3c2a9fc85c66dad9d09908b257beeedd78d which forgot to adapt this under the erroneous assumption that the feature did make it into ODF 1.3) Change-Id: Idfe37444b8287edd063fa9576e6d76a332552754 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95355 Tested-by: Jenkins Reviewed-by: Michael Stahl --- xmloff/source/draw/sdxmlexp.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xmloff/source/draw/sdxmlexp.cxx') diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index afc209bc9b50..99c5fcc4917d 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2499,9 +2499,11 @@ void SdXMLExport::collectAnnotationAutoStyles( const Reference& xDraw void SdXMLExport::exportAnnotations( const Reference& xDrawPage ) { - // do not export in ODF 1.2 or older - if (getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012) + // do not export in standard ODF 1.3 or older + if ((getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) == 0) + { return; + } Reference< XAnnotationAccess > xAnnotationAccess( xDrawPage, UNO_QUERY ); if( xAnnotationAccess.is() ) try -- cgit