diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:19:42 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:19:42 +0000 |
| commit | bb2a7f39c4ac6007f2188f4d39d49467a5e7bde5 (patch) | |
| tree | 123db624a7e508b0daf42f6d62069f60d2abefd3 /connectivity/source/drivers/adabas/BDriver.cxx | |
| parent | 41ae47126a56f1d17e5864a24bb76069f22adbb9 (diff) | |
INTEGRATION: CWS dba24 (1.17.52); FILE MERGED
2005/03/08 07:44:47 fs 1.17.52.3: RESYNC: (1.17-1.18); FILE MERGED
2005/02/09 08:07:36 oj 1.17.52.2: #i26950# remove the need for XNamed
2005/02/04 08:43:39 oj 1.17.52.1: STLPort fix from thb
Diffstat (limited to 'connectivity/source/drivers/adabas/BDriver.cxx')
| -rw-r--r-- | connectivity/source/drivers/adabas/BDriver.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx index bc03bb506e..dff539384c 100644 --- a/connectivity/source/drivers/adabas/BDriver.cxx +++ b/connectivity/source/drivers/adabas/BDriver.cxx @@ -2,9 +2,9 @@ * * $RCSfile: BDriver.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: vg $ $Date: 2005-02-24 14:38:29 $ + * last change: $Author: vg $ $Date: 2005-03-10 15:19:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,14 +170,14 @@ void ODriver::disposing() //------------------------------------------------------------------------------ rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.comp.sdbcx.adabas.ODriver"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbcx.adabas.ODriver")); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver"); - aSNS[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Driver"); + aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); + aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver")); return aSNS; } //------------------------------------------------------------------ @@ -233,9 +233,6 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, { odbc::OTools::ThrowException(pCon,nSQLRETURN,pCon->getConnection(),SQL_HANDLE_DBC,*this); } - else if(SQL_SUCCESS_WITH_INFO == nSQLRETURN) // this driver does not support odbc3 - { - } m_xConnections.push_back(WeakReferenceHelper(*pCon)); |