[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/iframe.cxx        |   15 ++++-----------
 sfx2/source/inc/eventsupplier.hxx |    1 +
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 26a8966b07f6335450ddbf4b0f5d5206db43bcbf
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Apr 20 20:58:21 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Apr 28 10:52:24 2023 +0200

    assume IFrame script/macro support isn't needed
    
    seems undocumented at least
    
    Change-Id: I316e4f4f25ddb7cf6b7bac4d856a721b987207a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151019
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index e0bb2b568b6e..4f3b414d5d69 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -167,23 +167,16 @@ sal_Bool SAL_CALL IFrameObject::load(
         uno::Reference < util::XURLTransformer > xTrans( 
util::URLTransformer::create( mxContext ) );
         xTrans->parseStrict( aTargetURL );
 
+        INetURLObject aURLObject(aTargetURL.Complete);
+        if (aURLObject.GetProtocol() == INetProtocol::Macro || 
aURLObject.isSchemeEqualTo(u"vnd.sun.star.script"))
+            return false;
+
         uno::Reference<frame::XFramesSupplier> xParentFrame = 
xFrame->getCreator();
         SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame);
 
-        if (INetURLObject(aTargetURL.Complete).GetProtocol() == 
INetProtocol::Macro)
-        {
-            if (pDoc && !pDoc->AdjustMacroMode())
-                return false;
-        }
-
-        if (!SfxEvents_Impl::isScriptURLAllowed(aTargetURL.Complete))
-            return false;
-
         bool bUpdateAllowed(true);
         if (pDoc)
         {
-            // perhaps should only check for file targets, but lets default to 
making it strong
-            // unless there is a known need to distinguish
             comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
pDoc->getEmbeddedObjectContainer();
             bUpdateAllowed = 
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
         }
diff --git a/sfx2/source/inc/eventsupplier.hxx 
b/sfx2/source/inc/eventsupplier.hxx
index 316b3b1836d7..56aa8f95e75f 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -81,6 +81,7 @@ public:
                                     SfxObjectShell* i_document );
     static void Execute( css::uno::Sequence < css::beans::PropertyValue > 
const & aEventData, const css::document::DocumentEvent& aTrigger, 
SfxObjectShell* pDoc );
 
+private:
     /// Check if script URL whitelist exists, and if so, if current script url 
is part of it
     static bool isScriptURLAllowed(const OUString& aScriptURL);
 };