Tag: cws_src680_dba30 User: fs Date: 06/03/21 10:21:17 Modified: /dba/dbaccess/source/core/api/ RowSetCache.hxx
Log: RESYNC: (1.25-1.28); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetCache.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.hxx?r1=1.25.14.1&r2=1.25.14.2 Delta lines: +10 -46 --------------------- --- RowSetCache.hxx 30 Dec 2005 06:20:21 -0000 1.25.14.1 +++ RowSetCache.hxx 21 Mar 2006 18:21:14 -0000 1.25.14.2 @@ -124,11 +124,6 @@ typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows; - ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes - // we need a extra mutex for columns to prevend deadlock when setting new values - // for a row - m_aColumnsMutex; - //the set can be static, bookmarkable or keyset ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xSet; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow @@ -162,8 +157,6 @@ sal_Bool m_bRowCountFinal ; sal_Bool m_bBeforeFirst ; sal_Bool m_bAfterLast ; - sal_Bool m_bInserted; - sal_Bool m_bDeleted ; sal_Bool m_bUpdated ; sal_Bool& m_bModified ; // points to the rowset member m_bModified sal_Bool& m_bNew ; // points to the rowset member m_bNew @@ -177,7 +170,6 @@ void rotateCacheIterator(sal_Int16 _nDist); void updateValue(sal_Int32 columnIndex,const connectivity::ORowSetValue& x); - connectivity::ORowSetValue getValue(sal_Int32 columnIndex); // checks and set the flags isAfterLast isLast and position when afterlast is true void checkPositionFlags(); void checkUpdateConditions(sal_Int32 columnIndex); @@ -210,39 +202,18 @@ // called from the rowset when a updateXXX was called for the first time void setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRow); - ORowSetCacheIterator createIterator(); + ORowSetCacheIterator createIterator(ORowSetBase* _pRowSet); // sets the size of the matrix void setMaxRowSize(sal_Int32 _nSize); TORowSetOldRowHelperRef registerOldRow(); void deregisterOldRow(const TORowSetOldRowHelperRef& _rRow); + void clearModified(); // ::com::sun::star::sdbc::XResultSetMetaDataSupplier ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > getMetaData( ); - // ::com::sun::star::sdbc::XRow - sal_Bool wasNull( ); - ::rtl::OUString getString( sal_Int32 columnIndex ); - sal_Bool getBoolean( sal_Int32 columnIndex ); - sal_Int8 getByte( sal_Int32 columnIndex ); - sal_Int16 getShort( sal_Int32 columnIndex ); - sal_Int32 getInt( sal_Int32 columnIndex ); - sal_Int64 getLong( sal_Int32 columnIndex ); - float getFloat( sal_Int32 columnIndex ); - double getDouble( sal_Int32 columnIndex ); - ::com::sun::star::uno::Sequence< sal_Int8 > getBytes( sal_Int32 columnIndex ); - ::com::sun::star::util::Date getDate( sal_Int32 columnIndex ); - ::com::sun::star::util::Time getTime( sal_Int32 columnIndex ); - ::com::sun::star::util::DateTime getTimestamp( sal_Int32 columnIndex ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getBinaryStream( sal_Int32 columnIndex ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getCharacterStream( sal_Int32 columnIndex ); - ::com::sun::star::uno::Any getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > getRef( sal_Int32 columnIndex ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > getBlob( sal_Int32 columnIndex ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > getClob( sal_Int32 columnIndex ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > getArray( sal_Int32 columnIndex ); - // ::com::sun::star::sdbcx::XRowLocate ::com::sun::star::uno::Any getBookmark( ); sal_Bool moveToBookmark( const ::com::sun::star::uno::Any& bookmark ); @@ -252,7 +223,6 @@ sal_Int32 hashBookmark( const ::com::sun::star::uno::Any& bookmark ); // ::com::sun::star::sdbc::XRowUpdate - void updateNull( sal_Int32 columnIndex ); void updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ); void updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ); void updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ); @@ -264,8 +234,8 @@ sal_Bool isAfterLast( ); sal_Bool isFirst( ); sal_Bool isLast( ); - void beforeFirst( ); - void afterLast( ); + sal_Bool beforeFirst( ); + sal_Bool afterLast( ); sal_Bool first( ); sal_Bool last( ); sal_Int32 getRow( ); @@ -275,8 +245,6 @@ void refreshRow( ); sal_Bool rowUpdated( ); sal_Bool rowInserted( ); - sal_Bool rowDeleted( ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getStatement( ); // ::com::sun::star::sdbc::XResultSetUpdate sal_Bool insertRow(); @@ -284,13 +252,9 @@ void updateRow(); void updateRow( ORowSetMatrix::iterator& _rUpdateRow ); - void deleteRow(); + bool deleteRow(); void cancelRowUpdates( ); void moveToInsertRow( ); - void moveToCurrentRow( ); - - // ::com::sun::star::sdbcx::XDeleteRows - ::com::sun::star::uno::Sequence< sal_Int32 > deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ); }; } #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
