Tag: cws_src680_warnings01 User: sb Date: 06/04/07 13:45:59 Modified: /dba/dbaccess/source/core/api/ RowSetCacheIterator.hxx
Log: RESYNC: (1.7-1.9); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetCacheIterator.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCacheIterator.hxx?r1=1.7.50.1&r2=1.7.50.2 Delta lines: +11 -6 -------------------- --- RowSetCacheIterator.hxx 24 Mar 2006 15:35:47 -0000 1.7.50.1 +++ RowSetCacheIterator.hxx 7 Apr 2006 20:45:57 -0000 1.7.50.2 @@ -44,10 +44,12 @@ namespace dbaccess { + class ORowSetBase; typedef struct { ORowSetMatrix::iterator aIterator; ::com::sun::star::uno::Any aBookmark; + ORowSetBase* pRowSet; } ORowSetCacheIterator_Helper; DECLARE_STL_STDKEY_MAP(sal_Int32,ORowSetCacheIterator_Helper,ORowSetCacheMap); @@ -58,14 +60,16 @@ friend class ORowSetCache; ORowSetCacheMap::iterator m_aIter; ORowSetCache* m_pCache; + ORowSetBase* m_pRowSet; protected: - ORowSetCacheIterator(const ORowSetCacheMap::iterator& _rIter,ORowSetCache* _pCache) - :m_aIter(_rIter) + ORowSetCacheIterator(const ORowSetCacheMap::iterator& _rIter,ORowSetCache* _pCache,ORowSetBase* _pRowSet) + : m_aIter(_rIter) ,m_pCache(_pCache) + ,m_pRowSet(_pRowSet) { } public: - ORowSetCacheIterator() :m_aIter(),m_pCache(NULL){} + ORowSetCacheIterator() :m_aIter(),m_pCache(NULL),m_pRowSet(NULL){} ORowSetCacheIterator(const ORowSetCacheIterator& _rRH); ORowSetCacheIterator& operator =(const ORowSetCacheIterator&); @@ -85,6 +89,7 @@ void setBookmark(const ::com::sun::star::uno::Any& _rBookmark); ::com::sun::star::uno::Any getBookmark() const { return m_aIter->second.aBookmark; } + ::osl::Mutex* getMutex() const; }; } #endif // DBACCESS_ROWSETCACHEITERATOR_HXX --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
