[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - desktop/source

[Tor Lillqvist]

 desktop/source/app/check_ext_deps.cxx      |    3 +++
 desktop/source/deployment/misc/dp_misc.cxx |    4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 3f26b006e4ef971dfa127d0e7582d369e63fa8d7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 25 16:26:30 2014 +0200

    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

diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 23c6b92..5df901b 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 b7720e1..b815be7 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)