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

[Petr Mladek]

 patches/dev300/apply                       |    4 -
 patches/dev300/testtool-more-defaults.diff |   94 -----------------------------
 2 files changed, 98 deletions(-)

New commits:
commit 50e692705319c1dc7a46bfab7d832e912011bc19
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 22 16:00:00 2011 +0200

    pushed testtool-more-defaults.diff into git
    
    worked better than without it even with normal installation

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 29f9c31..aa4e756 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -144,10 +144,6 @@ makefile-idl-build.diff, noelpwer
 # (even bigger savings on 64bit, and with dicts like the Czech one)
 #FIXME oog680: hunspell-hashify.diff, i#50842, dkeskar/jholesov
 
-# add no-crashreporter sections to testtool default config;
-# also guess office path from testtool.bin path i#FIXME?
-testtool-more-defaults.diff, martink
-
 #set default varchar lenght to 100.
 dbaccess-default-varchar-lenght.diff, i#62664, jianhua
 # for selection delete crash
diff --git a/patches/dev300/testtool-more-defaults.diff b/patches/dev300/testtool-more-defaults.diff
deleted file mode 100644
index 344c199..0000000
--- a/patches/dev300/testtool-more-defaults.diff
+++ /dev/null
@@ -1,94 +0,0 @@
----
- automation/source/testtool/objtest.cxx  |   62 +++++++++++++++++++++++++++++++
- automation/source/testtool/testtool.ini |    1 -
- solenv/bin/linkoo                       |    1 +
- 3 files changed, 63 insertions(+), 1 deletions(-)
-
-diff --git automation/source/testtool/objtest.cxx automation/source/testtool/objtest.cxx
-index e2f8614..38dfa61 100644
---- automation/source/testtool/objtest.cxx
-+++ automation/source/testtool/objtest.cxx
-@@ -530,6 +530,68 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
-     GetHostConfig();
-     GetTTPortConfig();
-     GetUnoPortConfig();
-+
-+    aConf.SetGroup("Crashreporter");
-+
-+    String aUP;
-+    GETSET( aUP, "UseProxy", "false" );
-+    String aPS;
-+    GETSET( aPS, "ProxyServer", "" );
-+    String aPP;
-+    GETSET( aPP, "ProxyPort", "" );
-+    String aAC;
-+    GETSET( aAC, "AllowContact", "false" );
-+    String aRA;
-+    GETSET( aRA, "ReturnAddress", "" );
-+
-+    OUString sPath;
-+    if( osl_getExecutableFile( (rtl_uString**)&sPath ) == osl_Process_E_None)
-+    {
-+        sPath = sPath.copy(7); // strip file://
-+
-+        int i = sPath.lastIndexOf('/');
-+        if (i >= 0)
-+            i = sPath.lastIndexOf('/', i-1 );
-+
-+        if (i >= 0)
-+        {
-+            sPath = sPath.copy(0, i);
-+            ByteString bsPath( sPath.getStr(), sPath.getLength(),
-+                               RTL_TEXTENCODING_UTF8 );
-+
-+            aConf.SetGroup( "OOoProgramDir" );
-+            String aOPD;
-+            // testtool is installed in Basis3.x/program/ dir nowadays
-+            bsPath += "/../program";
-+            GETSET( aOPD, "Current", bsPath);
-+
-+            ByteString aSrcRoot(getenv("SRC_ROOT"));
-+            aConf.SetGroup( "_profile_Default" );
-+            if (aSrcRoot.Len())
-+            {
-+                String aPBD;
-+                aSrcRoot += "/testautomation";
-+                GETSET( aPBD, "BaseDir", aSrcRoot );
-+
-+                String aPHD;
-+                aSrcRoot += "/global/hid";
-+                GETSET( aPHD, "HIDDir", aSrcRoot );
-+            }
-+            else
-+            {
-+                String aPBD;
-+                bsPath += "/qatesttool";
-+                GETSET( aPBD, "BaseDir", bsPath );
-+
-+                String aPHD;
-+                bsPath += "/global/hid";
-+                GETSET( aPHD, "HIDDir", bsPath );
-+            }
-+
-+            String aLD;
-+            GETSET( aLD, "LogBaseDir", ByteString( "/tmp" ) );
-+        }
-+    }
- }
- 
- #define MAKE_TT_KEYWORD( cName, aType, aResultType, nID )                       \
-diff --git automation/source/testtool/testtool.ini automation/source/testtool/testtool.ini
-index ff2e43f..7b77654 100644
---- automation/source/testtool/testtool.ini
-+++ automation/source/testtool/testtool.ini
-@@ -9,7 +9,6 @@ CurrentProfile=_profile_Default
- 
- [OOoProgramDir]
- Type=Path
--Current=.
- 
- [Crashreporter]
- UseProxy=false
--- 
-1.7.0.1
-