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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sat Jun 27 18:22:49 UTC 2020


 xmloff/source/draw/shapeexport.cxx |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit 2a87fbc2f645e8d607c235147d7a00293cdabafc
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jun 27 15:55:23 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jun 27 20:22:11 2020 +0200

    cid#1464966 Logically dead code
    
    since...
    
    commit d6c7fbe28aca170e804c4ebe7c1101bb3345c2c2
    Date:   Wed May 20 14:23:51 2020 +0200
    
        [API CHANGE] officecfg,xmloff: remove SaveBackwardCompatibleODF
    
    Change-Id: I05db7083262d02aa051372773fc6ef60c1549b8f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97311
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 597a71d2b2b2..418bb7662513 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2867,7 +2867,6 @@ void XMLShapeExport::ImpExportOLE2Shape(
         bool bInternal = false;
         xPropSet->getPropertyValue("IsInternal") >>= bInternal;
 
-        if( !bIsEmptyPresObj )
         {
 
             if ( bInternal )
@@ -2909,14 +2908,6 @@ void XMLShapeExport::ImpExportOLE2Shape(
                 }
             }
         }
-        else
-        {
-            // export empty href for empty placeholders to be valid ODF
-            mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, "" );
-            mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
-            mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
-            mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
-        }
 
         enum XMLTokenEnum eElem = sClassId.isEmpty() ? XML_OBJECT : XML_OBJECT_OLE ;
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, true, true );


More information about the Libreoffice-commits mailing list