[Libreoffice-commits] .: 3 commits - shell/source

[René Engelhard]

 shell/source/unix/exec/shellexec.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8cd3b5afc1b7794bdff2eeaeb75f985c466a3b00
Merge: 7b4217b... e888350...
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Jan 2 01:12:16 2011 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit e88835014fe5475cd019c0512a784cad8c3a4c25
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Dec 30 02:33:18 2010 +0100

    Do not block when launching firefox, fdo#32427.

diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 224452a..739dc44 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -282,7 +282,13 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
         pDesktopLaunch = NULL;
     }
 
-    OString cmd = aBuffer.makeStringAndClear();
+    OString cmd =
+#ifdef LINUX
+        // avoid blocking (call it in background)
+        OStringBuffer().append( "( " ).append( aBuffer ).append( " ) &" ).makeStringAndClear();
+#else
+        aBuffer.makeStringAndClear();
+#endif
     if ( 0 != pclose(popen(cmd.getStr(), "w")) )
     {
         int nerr = errno;
commit 1d5ea739d48df24c475a70292d17170e71140ea6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 29 20:23:41 2010 +0000

    Resolves: rhbz#666216 survive missing window
    (cherry picked from commit e9438320b50e647f6c5bf052148bcd501b7b55d4)

diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 2242d84..5698f86 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -522,8 +522,11 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
         xLayoutManager->unlock();
     }        
 
-    // set help ID for our canvas
-    pWindow->SetHelpId(HID_BACKINGWINDOW);
+    if (pWindow)
+    {
+        // set help ID for our canvas
+        pWindow->SetHelpId(HID_BACKINGWINDOW);
+    }
     
     // inform BackingWindow about frame
     BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow );