[Libreoffice-commits] core.git: xmloff/source

[Michael Stahl (via logerrit)]

 xmloff/source/draw/sdxmlexp.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bb95d189653d73911c187227ace682ba2b98172c
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Jun 2 13:14:58 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Jun 2 18:30:45 2020 +0200

    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 <michael.stahl at cib.de>

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<XDrawPage>& xDraw
 
 void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& 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