diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-02-25 16:26:30 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-15 01:55:29 +0300 |
| commit | 59ddf7216d52dd5492ffe1362174518dc2f5e0ce (patch) | |
| tree | f24d27a52fa6b44560a2e962605a0aa49ece62de /desktop | |
| parent | 8378bb3122417885db741dc8b6d770863afb72bd (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
Diffstat (limited to 'desktop')
| -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 e32bb139736b..ad2d72b07183 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> @@ -420,8 +421,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 a021e23d11b6..159605a44e70 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" @@ -559,7 +560,7 @@ void syncRepositories( Reference<task::XAbortChannel>(), xCmdEnv); } } - +#if !HAVE_FEATURE_MACOSX_SANDBOX if (bModified) { Reference<task::XRestartManager> restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext())); @@ -570,6 +571,7 @@ void syncRepositories( Reference<task::XInteractionHandler>()); } } +#endif } void disposeBridges(Reference<css::uno::XComponentContext> const & ctx) |