From 59c361d0fbd28fc35d5c84303c3308b6ffde369c Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 25 Jan 2006 12:44:07 +0000
Subject: [PATCH] INTEGRATION: CWS stlusagefix01 (1.7.74); FILE MERGED
 2006/01/16 13:47:17 oj 1.7.74.1: #i60480# fix stl usage

---
 dbaccess/source/core/api/RowSetCacheIterator.hxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index af236a4202d6..30ae9f53525f 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: RowSetCacheIterator.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 10:02:41 $
+ *  last change: $Author: hr $ $Date: 2006-01-25 13:44:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -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 @@ namespace dbaccess
         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&);