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

[Tor Lillqvist]

 desktop/source/app/officeipcthread.cxx                   |   11 ++++++++++-
 extensions/source/macosx/spotlight/mdimporter/Info.plist |    4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 9338e908d37312a845e2573bb5d99774b9456f25
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 30 19:42:45 2015 +0300

    tdf#92191: Don't use any IPC pipe in a sandboxed OS X app
    
    Creating the pipe fails when sandboxed. This caused us to not start
    the OfficeIPCThread, and that then meant that the file open requests
    coming in through VCL_NSApplication's application:openFile: method in
    vclnsapp.mm were not processed properly.
    
    The OS takes care of not starting multiple LO apps simultaneously
    anyway, so we don't really need any pipe, I hope.
    
    Change-Id: Ia920520ce2928787313f83199028f9c9942f61f3

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 2c4e9d1..e74aa83 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -516,9 +516,16 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
     if ( aUserInstallPathHashCode.isEmpty() )
         return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we cannot create a valid hash code!
 
+    PipeMode nPipeMode = PIPEMODE_DONTKNOW;
+
+#if HAVE_FEATURE_MACOSX_SANDBOX
+
+    nPipeMode = PIPEMODE_CREATED;
+
+#else
+
     OUString aPipeIdent( "SingleOfficeIPC_" + aUserInstallPathHashCode );
 
-    PipeMode nPipeMode = PIPEMODE_DONTKNOW;
     do
     {
         osl::Security &rSecurity = Security::get();
@@ -561,6 +568,8 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
 
     } while ( nPipeMode == PIPEMODE_DONTKNOW );
 
+#endif
+
     if ( nPipeMode == PIPEMODE_CREATED )
     {
         // Seems we are the one and only, so start listening thread
commit 423d13be37fe19eed3c51946eb2204c24aa10bad
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jun 21 14:41:22 2015 +0200

    ERROR ITMS-90511: CFBundleIdentifier Collision
    
    Change-Id: I4413853a2e8c23af770323a1e7b21cedb637cfb1

diff --git a/extensions/source/macosx/spotlight/mdimporter/Info.plist b/extensions/source/macosx/spotlight/mdimporter/Info.plist
index bc48f70..80cc31b 100644
--- a/extensions/source/macosx/spotlight/mdimporter/Info.plist
+++ b/extensions/source/macosx/spotlight/mdimporter/Info.plist
@@ -59,7 +59,7 @@
     <key>CFBundleIconFile</key>
     <string></string>
     <key>CFBundleIdentifier</key>
-    <string>org.openoffice.mdimporter</string>
+    <string>org.libreoffice-from-collabora.mdimporter</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleVersion</key>
@@ -82,6 +82,6 @@
     </dict>
     <key>CFPlugInUnloadFunction</key>
     <string></string>
-        
+
 </dict>
 </plist>