User: hr      
Date: 06/01/25 05:44:10

Modified:
 /dba/dbaccess/source/core/api/
  RowSetCacheIterator.hxx

Log:
 INTEGRATION: CWS stlusagefix01 (1.7.74); FILE MERGED
 2006/01/16 13:47:17 oj 1.7.74.1: #i60480# fix stl usage

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&r2=1.8
Delta lines:  +6 -2
-------------------
--- RowSetCacheIterator.hxx     8 Sep 2005 10:02:41 -0000       1.7
+++ RowSetCacheIterator.hxx     25 Jan 2006 13:44:07 -0000      1.8
@@ -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) 
+               ORowSetCacheIterator(const ORowSetCacheMap::iterator& 
_rIter,ORowSetCache* _pCache,ORowSetBase* _pRowSet) 
                        : m_aIter(_rIter)
                        ,m_pCache(_pCache)
+                       ,m_pRowSet(_pRowSet)
                {
                }
        public:
-               ORowSetCacheIterator() :m_pCache(NULL),m_aIter(){}
+               ORowSetCacheIterator() 
:m_pCache(NULL),m_aIter(),m_pRowSet(NULL){}
                ORowSetCacheIterator(const ORowSetCacheIterator& _rRH);
                ORowSetCacheIterator& operator =(const ORowSetCacheIterator&);
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to