diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-02-25 16:26:30 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-03-26 17:12:12 +0200 |
commit | 3f26b006e4ef971dfa127d0e7582d369e63fa8d7 (patch) | |
tree | e0b3d1232af3e219225118d4f06f9e406d042ba5 | |
parent | 809d724b6da3680f34f7e2e898aa72634a3331d7 (diff) |
Don't do the annoying restart thing when sandboxed on OS X, ignore risks...
So far we have just displayed a hugely annoying dialog "sorry, but we
suck, you need to start LibreOffice again". But that sucks. So just
try to do without restart then, and let's see what happens. At least
in trivial testing, no crash.
Change-Id: I475fe49a0fdb8086bb33a165a08b32ac46548857
-rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 3 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 23c6b92c8bbb..5df901b2e510 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -18,6 +18,7 @@ */ #include <config_folders.h> +#include <config_features.h> #include "osl/file.hxx" #include "osl/mutex.hxx" @@ -421,8 +422,10 @@ void Desktop::SynchronizeExtensionRepositories() if (m_bCleanedExtensionCache) { deployment::ExtensionManager::get(context)->reinstallDeployedExtensions( true, "user", Reference<task::XAbortChannel>(), silent); +#if !HAVE_FEATURE_MACOSX_SANDBOX task::OfficeRestartManager::get(context)->requestRestart( silent->getInteractionHandler()); +#endif } else { // reinstallDeployedExtensions above already calls syncRepositories // internally: diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index b7720e130a17..b815be74ba19 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -18,6 +18,7 @@ */ #include <config_folders.h> +#include <config_features.h> #include "dp_misc.h" #include "dp_version.hxx" @@ -556,7 +557,7 @@ void syncRepositories( Reference<task::XAbortChannel>(), xCmdEnv); } } - +#if !HAVE_FEATURE_MACOSX_SANDBOX if (bModified) { Reference<task::XRestartManager> restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext())); @@ -567,6 +568,7 @@ void syncRepositories( Reference<task::XInteractionHandler>()); } } +#endif } void disposeBridges(Reference<css::uno::XComponentContext> const & ctx) |