39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
From b79d62375e7b249c7b351b4b32a47ba310ac5fe9 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
|
|
Date: Thu, 30 Jan 2025 20:37:38 +0000
|
|
Subject: [PATCH] Filter out more unwanted command URIs
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Change-Id: I24c95d73b4fee89bdf044d5dd6efc9cd89627c54
|
|
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181016
|
|
Tested-by: Jenkins
|
|
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
(cherry picked from commit 7105fb698f897ddb38bd60315444c07356689e14)
|
|
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181116
|
|
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
|
|
erAck: backported to 7.1.8.1
|
|
---
|
|
desktop/source/app/cmdlineargs.cxx | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
|
|
index 93d9e87..70b9f05 100644
|
|
--- a/desktop/source/app/cmdlineargs.cxx
|
|
+++ b/desktop/source/app/cmdlineargs.cxx
|
|
@@ -168,7 +168,7 @@ CommandLineEvent CheckOfficeURI(/* in,out */ OUString& arg, CommandLineEvent cur
|
|
if (nURIlen < 0)
|
|
nURIlen = rest2.getLength();
|
|
auto const uri = rest2.copy(0, nURIlen);
|
|
- if (INetURLObject(uri).GetProtocol() == INetProtocol::Macro) {
|
|
+ if (INetURLObject(uri).IsExoticProtocol()) {
|
|
// Let the "Open" machinery process the full command URI (leading to failure, by intention,
|
|
// as the "Open" machinery does not know about those command URI schemes):
|
|
curEvt = CommandLineEvent::Open;
|
|
--
|
|
2.48.1
|