[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - xmloff/source

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/ximpshap.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5d5c9339427ef0efd6eb29965d6b951b9d480baf
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Sep 6 11:38:55 2022 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Sep 6 15:39:39 2022 +0200

    check impress/calc IFrame "FrameURL" target
    
    similar to
    
    commit c7450d0b9d02c64ae3da467d329040787039767e
    Date:   Tue Aug 30 17:01:08 2022 +0100
    
        check IFrame "FrameURL" target
    
    Conflicts:
            xmloff/source/draw/ximpshap.cxx
    
    Change-Id: Ibf28c29acb4476830431d02772f3ecd4b23a6a27

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8bee4b376ba1..3e0c10857080 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -87,6 +87,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/vector/b2dvector.hxx>
+#include <tools/urlobj.hxx>
 #include <o3tl/safeint.hxx>
 
 using namespace ::com::sun::star;
@@ -3243,13 +3244,12 @@ void SdXMLFloatingFrameShapeContext::StartElement( 
const css::uno::Reference< cs
 
             if( !maHref.isEmpty() )
             {
+                if (INetURLObject(maHref).GetProtocol() == INetProtocol::Macro)
+                    GetImport().NotifyMacroEventRead();
+
                 xProps->setPropertyValue("FrameURL", Any(maHref) );
             }
         }
-
-        SetStyle();
-
-        GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, 
mxShapes );
     }
 }