diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2017-12-13 15:09:36 +0000 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-19 23:00:45 +0530 |
| commit | 7978eb8f6efa64fb0d5fba993f029793672a78ba (patch) | |
| tree | 1dc84e492a7db6e828b85bc760320e6d6aaf548c /shell | |
| parent | fbd537ae68ec587c323fb0f1674bdd7747b93d04 (diff) | |
LOK: fix URL launching, so that Help buttons work.
Change-Id: I9efe0173c35341043c3402042d9aa364a03e4fc5
Reviewed-on: https://gerrit.libreoffice.org/46419
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 2ccf578372cd77060abb6db520985165e779de3f)
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_syssh.mk | 1 | ||||
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index c36056a9536b..cd64791f1cd5 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -14,6 +14,7 @@ $(eval $(call gb_Library_use_sdk_api,syssh)) $(eval $(call gb_Library_use_libraries,syssh,\ cppu \ cppuhelper \ + comphelper \ sal \ )) diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index d66a27668d06..095acec189b1 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <cppuhelper/supportsservice.hxx> +#include <comphelper/lok.hxx> #include <uno/current_context.hxx> @@ -97,6 +98,12 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar { OStringBuffer aBuffer, aLaunchBuffer; + if (comphelper::LibreOfficeKit::isActive()) + { + SAL_WARN("shell", "Unusual - shell attemp to launch " << aCommand << " with params " << aParameter << " under lok"); + return; + } + // DESKTOP_LAUNCH, see http://freedesktop.org/pipermail/xdg/2004-August/004489.html static const char *pDesktopLaunch = getenv( "DESKTOP_LAUNCH" ); |