commit bb95d189653d73911c187227ace682ba2b98172c
author Michael Stahl <Michael.Stahl@cib.de> Tue Jun 02 13:14:58 2020 +0200
committer Michael Stahl <michael.stahl@cib.de> Tue Jun 02 18:30:45 2020 +0200
tree a174df647b6a6a7dd62a469ba7cbc4c6b64542c4
parent 76e6c5f4a98b6da9b0d7945dd87f7476d90aebbc

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@cib.de>

xmloff/source/draw/sdxmlexp.cxx

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index afc209b..99c5fcc 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2499,9 +2499,11 @@

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