[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/testtool-more-defaults.diff |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 73e8d1a142cced7c467b0323c5dba2266832c8d5
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jun 12 17:15:55 2009 +0200

    testtool crasher with underfined SRC_ROOT
    
    * patches/dev300/testtool-more-defaults.diff: do not crash when SRC_ROOT is not
      defined and getenv returns NULL

diff --git a/patches/dev300/testtool-more-defaults.diff b/patches/dev300/testtool-more-defaults.diff
index c15dba7..f368e65 100644
--- a/patches/dev300/testtool-more-defaults.diff
+++ b/patches/dev300/testtool-more-defaults.diff
@@ -15,7 +15,7 @@ diff --git automation/source/testtool/objtest.cxx automation/source/testtool/obj
 index dceb0fa..f3f6e33 100644
 --- automation/source/testtool/objtest.cxx
 +++ automation/source/testtool/objtest.cxx
-@@ -531,6 +531,69 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
+@@ -531,6 +531,68 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
      GetHostConfig();
      GetTTPortConfig();
      GetUnoPortConfig();
@@ -54,8 +54,7 @@ index dceb0fa..f3f6e33 100644
 +            bsPath += "/../program";
 +            GETSET( aOPD, "Current", bsPath);
 +
-+            ByteString aSrcRoot;
-+            aSrcRoot += getenv("SRC_ROOT");
++            ByteString aSrcRoot(getenv("SRC_ROOT"));
 +            aConf.SetGroup( "_profile_Default" );
 +            if (aSrcRoot.Len())
 +            {