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

[Eike Rathke]

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

New commits:
commit f6add3f04bd5acc162ada79597a87398236f1320
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jun 20 13:20:47 2017 +0200

    Remove useless if() condition
    
    ... because we bail out already early for all versions <= SvtSaveOptions::ODFVER_012
    
    Change-Id: I80814be91c777dc03a9c821d706b24c7e1e757c1

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index ba792d13f128..7c7af84385f1 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2654,16 +2654,13 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
                     this->Characters(aAuthor);
                 }
 
-                if (SvtSaveOptions().GetODFDefaultVersion() > SvtSaveOptions::ODFVER_012)
+                // initials
+                OUString aInitials( xAnnotation->getInitials() );
+                if( !aInitials.isEmpty() )
                 {
-                    // initials
-                    OUString aInitials( xAnnotation->getInitials() );
-                    if( !aInitials.isEmpty() )
-                    {
-                        SvXMLElementExport aInitialsElem( *this, XML_NAMESPACE_LO_EXT,
-                                XML_SENDER_INITIALS, true, false );
-                        this->Characters(aInitials);
-                    }
+                    SvXMLElementExport aInitialsElem( *this, XML_NAMESPACE_LO_EXT,
+                            XML_SENDER_INITIALS, true, false );
+                    this->Characters(aInitials);
                 }
 
                 {