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

[Tor Lillqvist]

 desktop/source/app/check_ext_deps.cxx            |    4 ++++
 desktop/source/deployment/manager/dp_manager.cxx |    5 +++++
 desktop/source/deployment/misc/dp_misc.cxx       |    9 ++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 88b7cfff9972e6c65f34a0a423971d73a0d0f746
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 bb9aadb..ec59935 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "osl/file.hxx"
 #include "osl/mutex.hxx"
 
@@ -419,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 a086837..1fcd59f 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "dp_misc.h"
 #include "dp_version.hxx"
 #include "dp_interact.h"
@@ -554,7 +556,7 @@ void syncRepositories(
                 Reference<task::XAbortChannel>(), xCmdEnv);
         }
     }
-
+#if !HAVE_FEATURE_MACOSX_SANDBOX
     if (bModified)
     {
         Reference<task::XRestartManager> restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext()));
@@ -565,6 +567,7 @@ void syncRepositories(
                                       Reference<task::XInteractionHandler>());
         }
      }
+#endif
 }
 
 void disposeBridges(Reference<css::uno::XComponentContext> const & ctx)
commit 84e40209e0dd7b450dd46cc2c41f57ac275910dd
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 25 16:19:00 2014 +0200

    The "shared" extensions are read-only in the OS X sandboxed case
    
    Change-Id: Ie0e41ad5a5498d24a91da80dd7cc461b7fb5fa3b

diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 5bf0c91..ce17159 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 
 #include "dp_ucb.h"
 #include "dp_resource.h"
@@ -358,7 +359,11 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
         that->m_registrationData = "vnd.sun.star.expand:$SHARED_EXTENSIONS_USER";
         that->m_registryCache = "vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/registry";
         logFile = "vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/log.txt";
+#if !HAVE_FEATURE_MACOSX_SANDBOX
+        // The "shared" extensions are read-only when we have a
+        // read-only installset, like in the OS X sandboxed case.
         stamp = "$UNO_SHARED_PACKAGES_CACHE";
+#endif
     }
     else if ( context == "bundled" ) {
         that->m_activePackages = "vnd.sun.star.expand:$BUNDLED_EXTENSIONS";
commit 4acf730fc314ffbf7667b0ec8cf033285f5874e4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 25 15:00:38 2014 +0200

    The LO process is called just "soffice" on OS X
    
    Change-Id: I74a6af7f4dc49ccf8ff3ead0d5b3e5e9b78b4f7a

diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 5a1bd22..a086837 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -61,7 +61,11 @@ using namespace ::com::sun::star::uno;
 #define SWRITER "swriter.exe"
 #endif
 
+#ifdef MACOSX
+#define SOFFICE2 "soffice"
+#else
 #define SOFFICE2 "soffice.bin"
+#endif
 
 namespace dp_misc {
 namespace {