diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 15:55:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 15:55:51 +0000 |
| commit | 79c7e890a6e2930e7220169b60c9f635d8d1ec2d (patch) | |
| tree | 732d8375580f3acc9b5b79a79e3d813dd5ae493e /connectivity/source/drivers/adabas/BFunctions.cxx | |
| parent | 8766d05157d20d8fb4d6560b4810edf6d471eb18 (diff) | |
INTEGRATION: CWS insight01 (1.3.22); FILE MERGED
2004/07/05 13:30:32 oj 1.3.22.1: #i30450# check DBROOT
Diffstat (limited to 'connectivity/source/drivers/adabas/BFunctions.cxx')
| -rw-r--r-- | connectivity/source/drivers/adabas/BFunctions.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx index ae3a7a90cc5d..2adb2797ce72 100644 --- a/connectivity/source/drivers/adabas/BFunctions.cxx +++ b/connectivity/source/drivers/adabas/BFunctions.cxx @@ -2,9 +2,9 @@ * * $RCSfile: BFunctions.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:30:09 $ + * last change: $Author: hr $ $Date: 2004-08-02 16:55:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -147,14 +147,20 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath) return sal_True; rtl_uString* pPath = NULL; - ::rtl::OUString sTemp = ::rtl::OUString::createFromAscii("DBROOT"); - if(osl_getEnvironment(sTemp.pData,&pPath) == osl_Process_E_None && pPath) + ::rtl::OUString sTemp(RTL_CONSTASCII_USTRINGPARAM("DBROOT")); + if ( osl_getEnvironment(sTemp.pData,&pPath) == osl_Process_E_None && pPath ) { #if ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX) || defined(MACOSX) _rPath = ::rtl::OUString(pPath); _rPath += ::rtl::OUString::createFromAscii("/lib/"); #endif + rtl_uString_release(pPath); + } + else + { + _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The variable DBROOT is not set.")); + return sal_False; } #if defined(WIN) || defined(WNT) _rPath += ::rtl::OUString::createFromAscii("SQLOD32.DLL"); |