Tag: cws_src680_warnings01 User: fs Date: 05/12/12 06:33:35 Modified: /dba/connectivity/source/drivers/adabas/ BFunctions.cxx
Log: #i57457# File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BFunctions.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BFunctions.cxx?r1=1.5.28.1&r2=1.5.28.2 Delta lines: +10 -7 -------------------- --- BFunctions.cxx 21 Nov 2005 10:07:41 -0000 1.5.28.1 +++ BFunctions.cxx 12 Dec 2005 14:33:32 -0000 1.5.28.2 @@ -4,9 +4,9 @@ * * $RCSfile: BFunctions.cxx,v $ * - * $Revision: 1.5.28.1 $ + * $Revision: 1.5.28.2 $ * - * last change: $Author: fs $ $Date: 2005/11/21 10:07:41 $ + * last change: $Author: fs $ $Date: 2005/12/12 14:33:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -136,16 +136,19 @@ _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The variable DBROOT is not set.")); return sal_False; } + const sal_Char* pLibraryAsciiName = NULL; + #if defined(WIN) || defined(WNT) - _rPath += ::rtl::OUString::createFromAscii("SQLOD32.DLL"); + pLibraryAsciiName = "SQLOD32.DLL"; #elif ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX) - _rPath += ::rtl::OUString::createFromAscii("odbclib.so"); + pLibraryAsciiName = "odbclib.so"; #elif defined(MACOSX) - _rPath += ::rtl::OUString::createFromAscii("odbclib.dylib"); -#else - return sal_False; + pLibraryAsciiName = "odbclib.dylib"; #endif + if ( !pLibraryAsciiName ) + return sal_False; + _rPath += ::rtl::OUString::createFromAscii( pLibraryAsciiName ); pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) return sal_False; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
