User: vg Date: 05/03/10 07:19:45 Modified: /dba/connectivity/source/drivers/adabas/ BDriver.cxx
Log: 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 File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BDriver.cxx?r1=1.18&r2=1.19 Delta lines: +3 -6 ------------------- --- BDriver.cxx 24 Feb 2005 14:38:29 -0000 1.18 +++ BDriver.cxx 10 Mar 2005 15:19:42 -0000 1.19 @@ -170,14 +170,14 @@ //------------------------------------------------------------------------------ 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; } //------------------------------------------------------------------ @@ -232,9 +232,6 @@ if (nSQLRETURN == SQL_ERROR || nSQLRETURN == SQL_NO_DATA) { 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)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
