Tag: cws_src680_kaddrbook User: ebischoff Date: 05/12/06 07:15:25 Modified: /dba/connectivity/source/drivers/kab/ KDriver.cxx, KResultSet.cxx
Log: Reverting after an intense discussion with fs and kendy File Changes: Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: KDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KDriver.cxx?r1=1.1.2.6&r2=1.1.2.7 Delta lines: +4 -15 -------------------- --- KDriver.cxx 6 Dec 2005 14:48:55 -0000 1.1.2.6 +++ KDriver.cxx 6 Dec 2005 15:15:19 -0000 1.1.2.7 @@ -4,9 +4,9 @@ * * $RCSfile: KDriver.cxx,v $ * - * $Revision: 1.1.2.6 $ + * $Revision: 1.1.2.7 $ * - * last change: $Author: ebischoff $ $Date: 2005/12/06 14:48:55 $ + * last change: $Author: ebischoff $ $Date: 2005/12/06 15:15:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,9 +45,6 @@ #ifndef _OSL_PROCESS_H_ #include <osl/process.h> #endif -#ifndef _OSL_MODULE_H_ -#include <osl/module.h> -#endif using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -156,16 +153,8 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException) { - // we look whether we support this URL format - if (url.compareTo(::rtl::OUString::createFromAscii("sdbc:address:kab:"), 16)) - return sal_False; - - // we check that the KDE address book library is available - ::rtl::OUString sLibraryName = ::rtl::OUString::createFromAscii("libkabc.so"); - oslModule kabLib = osl_loadModule(sLibraryName.pData, SAL_LOADMODULE_DEFAULT); - if (!kabLib) return sal_False; - - return sal_True; + // here we have to look whether we support this URL format + return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:address:kab:"), 16)); } // -------------------------------------------------------------------------------- Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) File [changed]: KResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KResultSet.cxx?r1=1.1.2.14&r2=1.1.2.15 Delta lines: +2 -2 ------------------- --- KResultSet.cxx 5 Dec 2005 13:43:19 -0000 1.1.2.14 +++ KResultSet.cxx 6 Dec 2005 15:15:20 -0000 1.1.2.15 @@ -4,9 +4,9 @@ * * $RCSfile: KResultSet.cxx,v $ * - * $Revision: 1.1.2.14 $ + * $Revision: 1.1.2.15 $ * - * last change: $Author: ebischoff $ $Date: 2005/12/05 13:43:19 $ + * last change: $Author: ebischoff $ $Date: 2005/12/06 15:15:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
