Tag: cws_src680_mingwport2 User: vg Date: 2006/07/12 07:28:52 Modified: dba/connectivity/source/drivers/ado/AColumn.cxx
Log: RESYNC: (1.23-1.24); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: AColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AColumn.cxx?r1=1.23.22.1&r2=1.23.22.2 Delta lines: +7 -11 -------------------- --- AColumn.cxx 12 Jul 2006 10:37:58 -0000 1.23.22.1 +++ AColumn.cxx 12 Jul 2006 14:28:49 -0000 1.23.22.2 @@ -71,8 +71,6 @@ void WpADOColumn::Create() { - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; HRESULT hr = -1; _ADOColumn* pColumn = NULL; @@ -133,10 +131,8 @@ sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) - ? - (sal_Int64)this - : - OColumn_ADO::getSomething(rId); + ? reinterpret_cast< sal_Int64 >( this ) + : OColumn_ADO::getSomething(rId); } // ------------------------------------------------------------------------- void OAdoColumn::construct() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
