Tag: cws_src680_qiq User: fs Date: 2006/06/27 07:02:34 Modified: dba/connectivity/source/drivers/adabas/BConnection.cxx
Log: RESYNC: (1.18-1.19); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BConnection.cxx?r1=1.18.100.2&r2=1.18.100.3 Delta lines: +14 -16 --------------------- --- BConnection.cxx 16 May 2006 20:09:57 -0000 1.18.100.2 +++ BConnection.cxx 27 Jun 2006 14:02:31 -0000 1.18.100.3 @@ -142,12 +142,12 @@ if ( sHostName.getLength() ) aDSN = sHostName + ':' + aDSN; - SQLRETURN nSQLRETURN = OpenConnection(aDSN,nTimeout, aUID,aPWD); + SQLRETURN nSQLRETURN = openConnectionWithAuth(aDSN,nTimeout, aUID,aPWD); return nSQLRETURN; } //----------------------------------------------------------------------------- -SQLRETURN OAdabasConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, const ::rtl::OUString& _uid,const ::rtl::OUString& _pwd) +SQLRETURN OAdabasConnection::openConnectionWithAuth(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, const ::rtl::OUString& _uid,const ::rtl::OUString& _pwd) { if (m_aConnectionHandle == SQL_NULL_HANDLE) return -1; @@ -266,10 +266,8 @@ sal_Int64 SAL_CALL OAdabasConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException) { return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) - ? - (sal_Int64)this - : - OConnection_BASE2::getSomething(rId); + ? reinterpret_cast< sal_Int64 >( this ) + : OConnection_BASE2::getSomething(rId); } // ----------------------------------------------------------------------------- Sequence< sal_Int8 > OAdabasConnection::getUnoTunnelImplementationId() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
