[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                               |    5 -----
 patches/dev300/smoketest-officeconnection-fix.diff |   15 ---------------
 2 files changed, 20 deletions(-)

New commits:
commit a5a731d320ad315decdb2b2525485eab6fb7cacb
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 29 16:39:03 2011 +0200

    bin obsolete smoketest-officeconnection-fix.diff
    
    needed because of oosplash; solved in git another way

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0c8fdda..15ed857 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1480,11 +1480,6 @@ build-sled10-ixion-with-internal-boost.diff
 [ Fixes ]
 svx-ppt-bullet-offset-fix.diff, n#593609, rodo
 
-[ Fixes ]
-# soffice process doesn't block ( under linux ) connect
-# to raised office instance instead ( should work for windows too )
-smoketest-officeconnection-fix.diff
-
 [ GSoC2010 ]
 # Patches from GSoC 2010 students.
 online_gallery.diff, tijana
diff --git a/patches/dev300/smoketest-officeconnection-fix.diff b/patches/dev300/smoketest-officeconnection-fix.diff
deleted file mode 100644
index 28b195a..0000000
--- a/patches/dev300/smoketest-officeconnection-fix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git test/source/cpp/officeconnection.cxx test/source/cpp/officeconnection.cxx
-index 96f735a..9222c3a 100644
---- test/source/cpp/officeconnection.cxx
-+++ test/source/cpp/officeconnection.cxx
-@@ -112,6 +112,10 @@
-                     argSoffice.copy(RTL_CONSTASCII_LENGTH("path:"))).pData,
-                 args, SAL_N_ELEMENTS( args ), 0, 0, 0, envs,
-                 envs == 0 ? 0 : 1, &process_));
-+        // ooo-build soffice.bin doesn't block
-+        // desc string is already set up so below will try to connect
-+        // using the existing pipe
-+        process_ = 0; // don't join
-     } else if (argSoffice.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("connect:"))) {
-         desc = argSoffice.copy(RTL_CONSTASCII_LENGTH("connect:"));
-     } else {