Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:26:11 Modified: dba/dbaccess/source/core/api/RowSetCache.cxx
Log: RESYNC: (1.84-1.85); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetCache.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.cxx?r1=1.78.4.2&r2=1.78.4.3 Delta lines: +19 -19 --------------------- --- RowSetCache.cxx 20 Mar 2006 13:45:19 -0000 1.78.4.2 +++ RowSetCache.cxx 4 Jul 2006 07:26:08 -0000 1.78.4.3 @@ -132,27 +132,28 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, const Reference< XMultiServiceFactory >& _xServiceFactory, - const ORowSetValueVector& _rParameterRow, const ::rtl::OUString& _rUpdateTableName, sal_Bool& _bModified, sal_Bool& _bNew) - : m_xSet(_xRs) + :m_xSet(_xRs) + ,m_xMetaData(Reference< XResultSetMetaDataSupplier >(_xRs,UNO_QUERY)->getMetaData()) + ,m_xServiceFactory(_xServiceFactory) + ,m_pCacheSet(NULL) + ,m_pMatrix(NULL) + ,m_pInsertMatrix(NULL) + ,m_nLastColumnIndex(0) + ,m_nFetchSize(0) + ,m_nRowCount(0) + ,m_nPrivileges( Privilege::SELECT ) + ,m_nPosition(0) ,m_nStartPos(0) ,m_nEndPos(0) - ,m_nPosition(0) - ,m_nRowCount(0) + ,m_bRowCountFinal(sal_False) ,m_bBeforeFirst(sal_True) ,m_bAfterLast( sal_False ) - ,m_bRowCountFinal(sal_False) ,m_bUpdated(sal_False) - ,m_xMetaData(Reference< XResultSetMetaDataSupplier >(_xRs,UNO_QUERY)->getMetaData()) - ,m_xServiceFactory(_xServiceFactory) - ,m_nFetchSize(0) - ,m_bNew(_bNew) ,m_bModified(_bModified) - ,m_pMatrix(NULL) - ,m_pInsertMatrix(NULL) - ,m_pCacheSet(NULL) + ,m_bNew(_bNew) { DBG_CTOR(ORowSetCache,NULL); @@ -472,10 +473,9 @@ case DataType::SMALLINT: case DataType::INTEGER: return makeAny((sal_Int32)(*(*m_aMatrixIter))[0]); - break; default: if((*(*m_aMatrixIter))[0].isNull()) - (*(*m_aMatrixIter))[0] = m_pCacheSet->getBookmark(*m_aMatrixIter); + (*(*m_aMatrixIter))[0] = m_pCacheSet->getBookmark(); return (*(*m_aMatrixIter))[0].getAny(); } } @@ -526,9 +526,9 @@ return bRet; } // ------------------------------------------------------------------------- -sal_Int32 ORowSetCache::compareBookmarks( const Any& first, const Any& second ) +sal_Int32 ORowSetCache::compareBookmarks( const Any& _first, const Any& _second ) { - return (!first.hasValue() || !second.hasValue()) ? CompareBookmark::NOT_COMPARABLE : m_pCacheSet->compareBookmarks(first,second); + return (!_first.hasValue() || !_second.hasValue()) ? CompareBookmark::NOT_COMPARABLE : m_pCacheSet->compareBookmarks(_first,_second); } // ------------------------------------------------------------------------- sal_Bool ORowSetCache::hasOrderedBookmarks( ) @@ -588,7 +588,7 @@ (*(*m_aInsertRow))[columnIndex].setModified(); } // ------------------------------------------------------------------------- -void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale ) +void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) { checkUpdateConditions(columnIndex); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
