User: hr Date: 06/06/19 19:36:03 Modified: /dba/dbaccess/source/core/api/ RowSetBase.cxx
Log: INTEGRATION: CWS warnings01 (1.81.6); FILE MERGED 2006/05/29 11:19:11 sb 1.81.6.5: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170. 2006/05/23 23:42:44 sb 1.81.6.4: RESYNC: (1.84-1.85); FILE MERGED 2006/05/12 16:25:12 sb 1.81.6.3: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162 (and in some cases reverted previous, problematic changes). 2006/04/07 20:45:17 sb 1.81.6.2: RESYNC: (1.81-1.84); FILE MERGED 2006/03/24 15:35:46 fs 1.81.6.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetBase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.85&r2=1.86 Delta lines: +50 -36 --------------------- --- RowSetBase.cxx 19 Apr 2006 13:18:30 -0000 1.85 +++ RowSetBase.cxx 20 Jun 2006 02:36:00 -0000 1.86 @@ -77,9 +77,6 @@ #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> #endif -#ifndef _CONNECTIVITY_EMPTYMETADATA_HXX_ -#include <connectivity/emptymetadata.hxx> -#endif #ifndef _OSL_THREAD_H_ #include <osl/thread.h> #endif @@ -123,7 +120,7 @@ { } // ----------------------------------------------------------------------------- -connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const ::rtl::OUString& /*_rName*/) { return connectivity::sdbcx::ObjectType(); } @@ -137,16 +134,18 @@ ORowSetBase::ORowSetBase(::cppu::OBroadcastHelper &_rBHelper,::osl::Mutex* _pMutex) : OPropertyStateContainer(_rBHelper) , m_pMutex(_pMutex) - , m_rBHelper(_rBHelper) , m_pCache(NULL) , m_pColumns(NULL) - , m_bBeforeFirst(sal_True) // changed from sal_False - , m_bAfterLast(sal_False) - , m_bClone(sal_False) + , m_rBHelper(_rBHelper) + , m_pEmptyCollection( NULL ) + , m_nLastColumnIndex(-1) , m_nDeletedPosition(-1) + , m_nResultSetType( ResultSetType::FORWARD_ONLY ) + , m_nResultSetConcurrency( ResultSetConcurrency::READ_ONLY ) + , m_bClone(sal_False) , m_bIgnoreResult(sal_False) - , m_nLastColumnIndex(-1) - , m_pEmptyCollection( NULL ) + , m_bBeforeFirst(sal_True) // changed from sal_False + , m_bAfterLast(sal_False) { DBG_CTOR(ORowSetBase,NULL); @@ -401,7 +400,7 @@ return getBinaryStream(columnIndex); } // ------------------------------------------------------------------------- -Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& typeMap ) throw(SQLException, RuntimeException) +Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -409,36 +408,28 @@ return getValue(columnIndex).makeAny(); } // ------------------------------------------------------------------------- -Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( *m_pMutex ); - checkCache(); - - return Reference< XRef >(); + ::dbtools::throwFeatureNotImplementedException( "XRow::getRef", *m_pMySelf ); + return NULL; } // ------------------------------------------------------------------------- -Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( *m_pMutex ); - checkCache(); - - return Reference< XBlob >(); + ::dbtools::throwFeatureNotImplementedException( "XRow::getBlob", *m_pMySelf ); + return NULL; } // ------------------------------------------------------------------------- -Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( *m_pMutex ); - checkCache(); - - return Reference< XClob >(); + ::dbtools::throwFeatureNotImplementedException( "XRow::getClob", *m_pMySelf ); + return NULL; } // ------------------------------------------------------------------------- -Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( *m_pMutex ); - checkCache(); - - return Reference< XArray >(); + ::dbtools::throwFeatureNotImplementedException( "XRow::getArray", *m_pMySelf ); + return NULL; } // ------------------------------------------------------------------------- // ::com::sun::star::sdbcx::XRowLocate @@ -553,11 +544,11 @@ return bRet; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& first, const Any& second ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); - return m_pCache->compareBookmarks(first,second); + return m_pCache->compareBookmarks(_first,_second); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) @@ -583,8 +574,6 @@ Reference< XResultSetMetaData > xMeta; if(m_pCache) xMeta = m_pCache->getMetaData(); - else - xMeta = new OEmptyMetaData(); return xMeta; } @@ -1082,9 +1071,13 @@ OSL_ENSURE(m_aCurrentRow->isValid(),"Currentrow isn't valid"); OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!"); +#if OSL_DEBUG_LEVEL > 0 sal_Int32 nOldRow = m_pCache->getRow(); +#endif positionCache( MOVE_NONE_REFRESH_ONLY ); +#if OSL_DEBUG_LEVEL > 0 sal_Int32 nNewRow = m_pCache->getRow(); +#endif OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion"); m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); @@ -1233,6 +1226,27 @@ } // ----------------------------------------------------------------------------- +void ORowSetBase::fireRowcount() +{ +} + +// ----------------------------------------------------------------------------- +sal_Bool ORowSetBase::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& /*_rGuard*/) +{ + return sal_True; +} + +// ----------------------------------------------------------------------------- +void ORowSetBase::notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& /*_rGuard*/) +{ +} + +// ----------------------------------------------------------------------------- +void ORowSetBase::notifyAllListeners(::osl::ResettableMutexGuard& /*_rGuard*/) +{ +} + +// ----------------------------------------------------------------------------- sal_Bool ORowSetBase::isModification( ) { return m_pCache && m_pCache->m_bNew; @@ -1331,7 +1345,7 @@ return aOldValues; } // ----------------------------------------------------------------------------- -Any ORowSetBase::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const +Any ORowSetBase::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/ ) const { return Any(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
