diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/floating-frame-targets-unneeded-protocols.diff | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/debian/patches/floating-frame-targets-unneeded-protocols.diff b/debian/patches/floating-frame-targets-unneeded-protocols.diff new file mode 100644 index 000000000..3da0cd7fd --- /dev/null +++ b/debian/patches/floating-frame-targets-unneeded-protocols.diff @@ -0,0 +1,76 @@ +From 37d73a1ab94b43e03866d5a910cb58331543b8c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com> +Date: Fri, 3 Nov 2023 17:14:26 +0000 +Subject: add some protocols that don't make sense as floating frame targets +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: Id900a5eef248731d1184c1df501a2cf7a2de7eb9 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158910 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> +(cherry picked from commit 11ebdfef16501c6d35c3e3d0d62507f706557c71) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158900 +Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> +(cherry picked from commit bab433911bdecb344f7ea94dbd00690241a08c54) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159582 +--- + include/tools/urlobj.hxx | 5 +++++ + sfx2/source/doc/iframe.cxx | 5 ++++- + tools/source/fsys/urlobj.cxx | 8 ++++++++ + 3 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx +index 9d6820ddf241..dfd658722826 100644 +--- a/include/tools/urlobj.hxx ++++ b/include/tools/urlobj.hxx +@@ -915,6 +915,11 @@ public: + + void changeScheme(INetProtocol eTargetScheme); + ++ // INetProtocol::Macro, INetProtocol::Uno, INetProtocol::Slot, ++ // vnd.sun.star.script, etc. All the types of URLs which shouldn't ++ // be accepted from an outside controlled source ++ bool IsExoticProtocol() const; ++ + private: + // General Structure: + +diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx +index 150218b436e9..b81ce82fd32e 100644 +--- a/sfx2/source/doc/iframe.cxx ++++ b/sfx2/source/doc/iframe.cxx +@@ -168,8 +168,11 @@ sal_Bool SAL_CALL IFrameObject::load( + xTrans->parseStrict( aTargetURL ); + + INetURLObject aURLObject(aTargetURL.Complete); +- if (aURLObject.GetProtocol() == INetProtocol::Macro || aURLObject.isSchemeEqualTo(u"vnd.sun.star.script")) ++ if (aURLObject.IsExoticProtocol()) ++ { ++ SAL_WARN("sfx", "IFrameObject::load ignoring: " << aTargetURL.Complete); + return false; ++ } + + uno::Reference<frame::XFramesSupplier> xParentFrame = xFrame->getCreator(); + SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame); +diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx +index 764bb28ef623..2a9f7bc3d7dc 100644 +--- a/tools/source/fsys/urlobj.cxx ++++ b/tools/source/fsys/urlobj.cxx +@@ -4829,4 +4829,12 @@ OUString INetURLObject::CutExtension() + ? aTheExtension : OUString(); + } + ++bool INetURLObject::IsExoticProtocol() const ++{ ++ return m_eScheme == INetProtocol::Slot || ++ m_eScheme == INetProtocol::Macro || ++ m_eScheme == INetProtocol::Uno || ++ isSchemeEqualTo(u"vnd.sun.star.script"); ++} ++ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +-- +cgit v1.2.1 + |