User: hr Date: 06/06/19 18:21:00 Modified: /dba/connectivity/source/drivers/dbase/ DResultSet.cxx
Log: INTEGRATION: CWS warnings01 (1.22.30); FILE MERGED 2005/12/22 11:44:40 fs 1.22.30.3: #i57457# warning-free code 2005/11/16 12:58:55 fs 1.22.30.2: #i57457# warning free code 2005/11/07 14:43:14 fs 1.22.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DResultSet.cxx?r1=1.22&r2=1.23 Delta lines: +25 -23 --------------------- --- DResultSet.cxx 8 Sep 2005 05:39:46 -0000 1.22 +++ DResultSet.cxx 20 Jun 2006 01:20:58 -0000 1.23 @@ -56,6 +56,9 @@ #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> #endif +#ifndef _DBHELPER_DBEXCEPTION_HXX_ +#include <connectivity/dbexception.hxx> +#endif using namespace ::comphelper; @@ -148,11 +151,11 @@ } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& first, const Any& second ) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException) { - sal_Int32 nFirst,nSecond,nResult; - first >>= nFirst; - second >>= nSecond; + sal_Int32 nFirst(0),nSecond(0),nResult(0); + if ( !( lhs >>= nFirst ) || !( rhs >>= nSecond ) ) + ::dbtools::throwSQLException( "XRowLocate::compareBookmarks: Invalid bookmark value", "HY111", *this ); // have a look at CompareBookmark // we can't use the names there because we already have defines with the same name from the parser @@ -181,12 +184,12 @@ } // ------------------------------------------------------------------------- // XDeleteRows -Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const Sequence< Any >& rows ) throw( SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw( SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + ::dbtools::throwFeatureNotImplementedException( "XDeleteRows::deleteRows", *this ); return Sequence< sal_Int32 >(); } // ------------------------------------------------------------------------- @@ -195,7 +198,7 @@ Reference<XUnoTunnel> xTunnel(_xIndex,UNO_QUERY); if(xTunnel.is()) { - dbase::ODbaseIndex* pIndex = (dbase::ODbaseIndex*)xTunnel->getSomething(dbase::ODbaseIndex::getUnoTunnelImplementationId()); + dbase::ODbaseIndex* pIndex = reinterpret_cast< dbase::ODbaseIndex* >( xTunnel->getSomething(dbase::ODbaseIndex::getUnoTunnelImplementationId()) ); if(pIndex) { dbase::OIndexIterator* pIter = pIndex->createIterator(NULL,NULL); @@ -212,7 +215,6 @@ nRec = pIter->Next(); } m_pFileSet->setFrozen(); - // m_bFileSetFrozen = sal_True; // if(!bDistinct) // SetRowCount(pFileSet->count()); delete pIter; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
