diff options
Diffstat (limited to 'patches/dev300/testtool-more-defaults.diff')
-rw-r--r-- | patches/dev300/testtool-more-defaults.diff | 94 |
1 files changed, 0 insertions, 94 deletions
diff --git a/patches/dev300/testtool-more-defaults.diff b/patches/dev300/testtool-more-defaults.diff deleted file mode 100644 index 344c19932..000000000 --- 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 - |