Kaydet (Commit) 59ddf721 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 8378bb31
......@@ -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:
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment