Tag: cws_src680_warnings01 User: sb Date: 06/05/23 16:43:42 Modified: /dba/dbaccess/source/core/api/ resultset.cxx
Log: RESYNC: (1.14-1.15); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: resultset.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/resultset.cxx?r1=1.14.28.1&r2=1.14.28.2 Delta lines: +97 -93 --------------------- --- resultset.cxx 24 Mar 2006 15:35:49 -0000 1.14.28.1 +++ resultset.cxx 23 May 2006 23:43:39 -0000 1.14.28.2 @@ -101,7 +101,8 @@ sal_Bool _bCaseSensitive) :OResultSetBase(m_aMutex) ,OPropertySetHelper(OResultSetBase::rBHelper) - ,m_xAggregateAsResultSet(_xResultSet) + ,m_xDelegatorResultSet(_xResultSet) + ,m_aWarnings( Reference< XWarningsSupplier >( _xResultSet, UNO_QUERY ) ) ,m_bIsBookmarkable(sal_False) { DBG_CTOR(OResultSet, NULL); @@ -111,10 +112,11 @@ try { m_aStatement = _xStatement; - m_xAggregateAsRow = Reference< ::com::sun::star::sdbc::XRow >(m_xAggregateAsResultSet, UNO_QUERY); - m_xAggregateAsRowUpdate = Reference< ::com::sun::star::sdbc::XRowUpdate >(m_xAggregateAsResultSet, UNO_QUERY); + m_xDelegatorResultSetUpdate = m_xDelegatorResultSetUpdate.query( m_xDelegatorResultSet ); + m_xDelegatorRow = m_xDelegatorRow.query( m_xDelegatorResultSet ); + m_xDelegatorRowUpdate = m_xDelegatorRowUpdate.query( m_xDelegatorResultSet ); - Reference< XPropertySet > xSet(m_xAggregateAsResultSet, UNO_QUERY); + Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY); xSet->getPropertyValue(PROPERTY_RESULTSETTYPE) >>= m_nResultSetType; xSet->getPropertyValue(PROPERTY_RESULTSETCONCURRENCY) >>= m_nResultSetConcurrency; @@ -207,11 +209,11 @@ m_pColumns->disposing(); // close the pending result set - Reference< XCloseable > (m_xAggregateAsResultSet, UNO_QUERY)->close(); + Reference< XCloseable > (m_xDelegatorResultSet, UNO_QUERY)->close(); - m_xAggregateAsResultSet = NULL; - m_xAggregateAsRow = NULL; - m_xAggregateAsRowUpdate = NULL; + m_xDelegatorResultSet = NULL; + m_xDelegatorRow = NULL; + m_xDelegatorRowUpdate = NULL; m_aStatement = Reference< XInterface >(); } @@ -290,7 +292,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) { // set it for the driver result set - Reference< XPropertySet > xSet(m_xAggregateAsResultSet, UNO_QUERY); + Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY); switch (nHandle) { case PROPERTY_ID_FETCHDIRECTION: @@ -324,7 +326,7 @@ OSL_ENSURE(aPropName.getLength(), "property not found?"); // now read the value - rValue = Reference< XPropertySet >(m_xAggregateAsResultSet, UNO_QUERY)->getPropertyValue(aPropName); + rValue = Reference< XPropertySet >(m_xDelegatorResultSet, UNO_QUERY)->getPropertyValue(aPropName); } } } @@ -335,8 +337,7 @@ { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - - return Reference< XWarningsSupplier >(m_xAggregateAsResultSet, UNO_QUERY)->getWarnings(); + return m_aWarnings.getWarnings(); } //------------------------------------------------------------------------------ @@ -344,8 +345,7 @@ { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - - Reference< XWarningsSupplier >(m_xAggregateAsResultSet, UNO_QUERY)->clearWarnings(); + m_aWarnings.clearWarnings(); } // ::com::sun::star::sdbc::XResultSetMetaDataSupplier @@ -355,7 +355,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return Reference< XResultSetMetaDataSupplier >(m_xAggregateAsResultSet, UNO_QUERY)->getMetaData(); + return Reference< XResultSetMetaDataSupplier >(m_xDelegatorResultSet, UNO_QUERY)->getMetaData(); } // ::com::sun::star::sdbc::XColumnLocate @@ -365,7 +365,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return Reference< XColumnLocate >(m_xAggregateAsResultSet, UNO_QUERY)->findColumn(columnName); + return Reference< XColumnLocate >(m_xDelegatorResultSet, UNO_QUERY)->findColumn(columnName); } //------------------------------------------------------------------------------ @@ -404,7 +404,7 @@ if (!m_pColumns->isInitialized()) { // get the metadata - Reference< XResultSetMetaData > xMetaData = Reference< XResultSetMetaDataSupplier >(m_xAggregateAsResultSet, UNO_QUERY)->getMetaData(); + Reference< XResultSetMetaData > xMetaData = Reference< XResultSetMetaDataSupplier >(m_xDelegatorResultSet, UNO_QUERY)->getMetaData(); // do we have columns try { @@ -414,7 +414,7 @@ { // retrieve the name of the column rtl::OUString aName = xMetaData->getColumnName(i + 1); - ODataColumn* pColumn = new ODataColumn(xMetaData, m_xAggregateAsRow, m_xAggregateAsRowUpdate, i + 1, xDBMetaData); + ODataColumn* pColumn = new ODataColumn(xMetaData, m_xDelegatorRow, m_xDelegatorRowUpdate, i + 1, xDBMetaData); m_pColumns->append(aName, pColumn); } } @@ -433,7 +433,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->wasNull(); + return m_xDelegatorRow->wasNull(); } //------------------------------------------------------------------------------ rtl::OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -441,7 +441,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getString(columnIndex); + return m_xDelegatorRow->getString(columnIndex); } //------------------------------------------------------------------------------ sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -449,7 +449,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getBoolean(columnIndex); + return m_xDelegatorRow->getBoolean(columnIndex); } //------------------------------------------------------------------------------ sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -457,7 +457,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getByte(columnIndex); + return m_xDelegatorRow->getByte(columnIndex); } //------------------------------------------------------------------------------ sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -465,7 +465,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getShort(columnIndex); + return m_xDelegatorRow->getShort(columnIndex); } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -473,7 +473,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getInt(columnIndex); + return m_xDelegatorRow->getInt(columnIndex); } //------------------------------------------------------------------------------ sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -481,7 +481,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getLong(columnIndex); + return m_xDelegatorRow->getLong(columnIndex); } //------------------------------------------------------------------------------ float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -489,7 +489,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getFloat(columnIndex); + return m_xDelegatorRow->getFloat(columnIndex); } //------------------------------------------------------------------------------ double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -497,7 +497,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getDouble(columnIndex); + return m_xDelegatorRow->getDouble(columnIndex); } //------------------------------------------------------------------------------ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -505,7 +505,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getBytes(columnIndex); + return m_xDelegatorRow->getBytes(columnIndex); } //------------------------------------------------------------------------------ ::com::sun::star::util::Date OResultSet::getDate(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -513,7 +513,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getDate(columnIndex); + return m_xDelegatorRow->getDate(columnIndex); } //------------------------------------------------------------------------------ ::com::sun::star::util::Time OResultSet::getTime(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -521,7 +521,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getTime(columnIndex); + return m_xDelegatorRow->getTime(columnIndex); } //------------------------------------------------------------------------------ ::com::sun::star::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -529,7 +529,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getTimestamp(columnIndex); + return m_xDelegatorRow->getTimestamp(columnIndex); } //------------------------------------------------------------------------------ Reference< ::com::sun::star::io::XInputStream > OResultSet::getBinaryStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -537,7 +537,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getBinaryStream(columnIndex); + return m_xDelegatorRow->getBinaryStream(columnIndex); } //------------------------------------------------------------------------------ Reference< ::com::sun::star::io::XInputStream > OResultSet::getCharacterStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -545,7 +545,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getCharacterStream(columnIndex); + return m_xDelegatorRow->getCharacterStream(columnIndex); } //------------------------------------------------------------------------------ Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException ) @@ -553,7 +553,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getObject(columnIndex, typeMap); + return m_xDelegatorRow->getObject(columnIndex, typeMap); } //------------------------------------------------------------------------------ Reference< XRef > OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -561,7 +561,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getRef(columnIndex); + return m_xDelegatorRow->getRef(columnIndex); } //------------------------------------------------------------------------------ Reference< XBlob > OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -569,7 +569,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getBlob(columnIndex); + return m_xDelegatorRow->getBlob(columnIndex); } //------------------------------------------------------------------------------ Reference< XClob > OResultSet::getClob(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -577,7 +577,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getClob(columnIndex); + return m_xDelegatorRow->getClob(columnIndex); } //------------------------------------------------------------------------------ Reference< XArray > OResultSet::getArray(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) @@ -585,7 +585,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsRow->getArray(columnIndex); + return m_xDelegatorRow->getArray(columnIndex); } // ::com::sun::star::sdbc::XRowUpdate @@ -597,7 +597,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateNull(columnIndex); + m_xDelegatorRowUpdate->updateNull(columnIndex); } //------------------------------------------------------------------------------ @@ -608,7 +608,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateBoolean(columnIndex, x); + m_xDelegatorRowUpdate->updateBoolean(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLException, RuntimeException ) @@ -618,7 +618,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateByte(columnIndex, x); + m_xDelegatorRowUpdate->updateByte(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLException, RuntimeException ) @@ -628,7 +628,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateShort(columnIndex, x); + m_xDelegatorRowUpdate->updateShort(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLException, RuntimeException ) @@ -638,7 +638,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateInt(columnIndex, x); + m_xDelegatorRowUpdate->updateInt(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLException, RuntimeException ) @@ -648,7 +648,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateLong(columnIndex, x); + m_xDelegatorRowUpdate->updateLong(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException, RuntimeException ) @@ -658,7 +658,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateFloat(columnIndex, x); + m_xDelegatorRowUpdate->updateFloat(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLException, RuntimeException ) @@ -668,7 +668,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateDouble(columnIndex, x); + m_xDelegatorRowUpdate->updateDouble(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateString(sal_Int32 columnIndex, const rtl::OUString& x) throw( SQLException, RuntimeException ) @@ -678,7 +678,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateString(columnIndex, x); + m_xDelegatorRowUpdate->updateString(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException ) @@ -688,7 +688,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateBytes(columnIndex, x); + m_xDelegatorRowUpdate->updateBytes(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw( SQLException, RuntimeException ) @@ -698,7 +698,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateDate(columnIndex, x); + m_xDelegatorRowUpdate->updateDate(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException ) @@ -708,7 +708,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateTime(columnIndex, x); + m_xDelegatorRowUpdate->updateTime(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException ) @@ -718,7 +718,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateTimestamp(columnIndex, x); + m_xDelegatorRowUpdate->updateTimestamp(columnIndex, x); } //------------------------------------------------------------------------------ void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException ) @@ -728,7 +728,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateBinaryStream(columnIndex, x, length); + m_xDelegatorRowUpdate->updateBinaryStream(columnIndex, x, length); } //------------------------------------------------------------------------------ void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException ) @@ -738,7 +738,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateCharacterStream(columnIndex, x, length); + m_xDelegatorRowUpdate->updateCharacterStream(columnIndex, x, length); } //------------------------------------------------------------------------------ void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException ) @@ -748,7 +748,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateNumericObject(columnIndex, x, scale); + m_xDelegatorRowUpdate->updateNumericObject(columnIndex, x, scale); } //------------------------------------------------------------------------------ @@ -759,7 +759,7 @@ checkReadOnly(); - m_xAggregateAsRowUpdate->updateObject(columnIndex, x); + m_xDelegatorRowUpdate->updateObject(columnIndex, x); } // ::com::sun::star::sdbc::XResultSet @@ -769,7 +769,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->next(); + return m_xDelegatorResultSet->next(); } //------------------------------------------------------------------------------ @@ -778,7 +778,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->isBeforeFirst(); + return m_xDelegatorResultSet->isBeforeFirst(); } //------------------------------------------------------------------------------ @@ -787,7 +787,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->isAfterLast(); + return m_xDelegatorResultSet->isAfterLast(); } //------------------------------------------------------------------------------ @@ -796,7 +796,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->isFirst(); + return m_xDelegatorResultSet->isFirst(); } //------------------------------------------------------------------------------ @@ -805,7 +805,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->isLast(); + return m_xDelegatorResultSet->isLast(); } //------------------------------------------------------------------------------ @@ -814,7 +814,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - m_xAggregateAsResultSet->beforeFirst(); + m_xDelegatorResultSet->beforeFirst(); } //------------------------------------------------------------------------------ @@ -823,7 +823,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - m_xAggregateAsResultSet->afterLast(); + m_xDelegatorResultSet->afterLast(); } //------------------------------------------------------------------------------ @@ -832,7 +832,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->first(); + return m_xDelegatorResultSet->first(); } //------------------------------------------------------------------------------ @@ -841,7 +841,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->last(); + return m_xDelegatorResultSet->last(); } //------------------------------------------------------------------------------ @@ -850,7 +850,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->getRow(); + return m_xDelegatorResultSet->getRow(); } //------------------------------------------------------------------------------ @@ -859,7 +859,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->absolute(row); + return m_xDelegatorResultSet->absolute(row); } //------------------------------------------------------------------------------ @@ -868,7 +868,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->relative(rows); + return m_xDelegatorResultSet->relative(rows); } //------------------------------------------------------------------------------ @@ -877,7 +877,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->previous(); + return m_xDelegatorResultSet->previous(); } //------------------------------------------------------------------------------ @@ -886,7 +886,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - m_xAggregateAsResultSet->refreshRow(); + m_xDelegatorResultSet->refreshRow(); } //------------------------------------------------------------------------------ @@ -895,7 +895,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->rowUpdated(); + return m_xDelegatorResultSet->rowUpdated(); } //------------------------------------------------------------------------------ @@ -904,7 +904,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->rowInserted(); + return m_xDelegatorResultSet->rowInserted(); } //------------------------------------------------------------------------------ @@ -913,7 +913,7 @@ MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); - return m_xAggregateAsResultSet->rowDeleted(); + return m_xDelegatorResultSet->rowDeleted(); } //------------------------------------------------------------------------------ @@ -934,7 +934,7 @@ checkBookmarkable(); - return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->getBookmark(); + return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->getBookmark(); } //------------------------------------------------------------------------------ @@ -945,7 +945,7 @@ checkBookmarkable(); - return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->moveToBookmark(bookmark); + return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveToBookmark(bookmark); } //------------------------------------------------------------------------------ @@ -956,7 +956,7 @@ checkBookmarkable(); - return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->moveRelativeToBookmark(bookmark, rows); + return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveRelativeToBookmark(bookmark, rows); } //------------------------------------------------------------------------------ @@ -967,7 +967,7 @@ checkBookmarkable(); - return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->compareBookmarks(_first, _second); + return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->compareBookmarks(_first, _second); } //------------------------------------------------------------------------------ @@ -978,7 +978,7 @@ checkBookmarkable(); - return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->hasOrderedBookmarks(); + return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->hasOrderedBookmarks(); } //------------------------------------------------------------------------------ @@ -989,7 +989,7 @@ checkBookmarkable(); - return Reference< XRowLocate >(m_xAggregateAsResultSet, UNO_QUERY)->hashBookmark(bookmark); + return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->hashBookmark(bookmark); } // ::com::sun::star::sdbc::XResultSetUpdate @@ -1001,7 +1001,7 @@ checkReadOnly(); - Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->insertRow(); + m_xDelegatorResultSetUpdate->insertRow(); } //------------------------------------------------------------------------------ @@ -1012,7 +1012,7 @@ checkReadOnly(); - Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->updateRow(); + m_xDelegatorResultSetUpdate->updateRow(); } //------------------------------------------------------------------------------ @@ -1023,7 +1023,7 @@ checkReadOnly(); - Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->deleteRow(); + m_xDelegatorResultSetUpdate->deleteRow(); } //------------------------------------------------------------------------------ @@ -1034,7 +1034,7 @@ checkReadOnly(); - Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->cancelRowUpdates(); + m_xDelegatorResultSetUpdate->cancelRowUpdates(); } //------------------------------------------------------------------------------ @@ -1045,7 +1045,7 @@ checkReadOnly(); - Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->moveToInsertRow(); + m_xDelegatorResultSetUpdate->moveToInsertRow(); } //------------------------------------------------------------------------------ @@ -1056,19 +1056,23 @@ checkReadOnly(); - Reference< XResultSetUpdate >(m_xAggregateAsResultSet, UNO_QUERY)->moveToCurrentRow(); + m_xDelegatorResultSetUpdate->moveToCurrentRow(); } + // ----------------------------------------------------------------------------- -void OResultSet::checkReadOnly() +void OResultSet::checkReadOnly() const { - if (isReadOnly()) - throwFunctionSequenceException(*this); + if ( ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY ) + || !m_xDelegatorResultSetUpdate.is() + ) + throwSQLException( "The result set is read-only.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) ); } + // ----------------------------------------------------------------------------- -void OResultSet::checkBookmarkable() +void OResultSet::checkBookmarkable() const { - if (!m_bIsBookmarkable) - throwFunctionSequenceException(*this); + if ( !m_bIsBookmarkable ) + throwSQLException( "The result set does not have bookmark support.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) ); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
