diff options
| -rw-r--r-- | sc/inc/dpobject.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index d2fba890ebb9..e0370772a988 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -262,7 +262,7 @@ class ScDPCollection : public ScCollection { private: ScDocument* pDoc; - std::list<ScDPTableDataCache*> m_listDPObjectsCaches; + ::std::list<ScDPTableDataCache*> maDPDataCaches; public: ScDPCollection(ScDocument* pDocument); ScDPCollection(const ScDPCollection& r); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index feed9973501d..f761f69bd39e 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2641,7 +2641,7 @@ bool ScDPCollection::HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const ScDPTableDataCache* ScDPCollection::GetDPObjectCache( long nID ) { - for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); ++iter ) + for ( std::list<ScDPTableDataCache*>::iterator iter = maDPDataCaches.begin(); iter!=maDPDataCaches.end(); ++iter ) { // if ( nID == (*iter)->GetId() ) return *iter; @@ -2673,18 +2673,18 @@ long ScDPCollection::AddDPObjectCache( ScDPTableDataCache* pData ) { //create a id for it pData->SetId( GetNewDPObjectCacheId() ); } - m_listDPObjectsCaches.push_back( pData ); + maDPDataCaches.push_back( pData ); return pData->GetId(); } void ScDPCollection::RemoveDPObjectCache( long nID ) { - for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); ++iter ) + for ( std::list<ScDPTableDataCache*>::iterator iter = maDPDataCaches.begin(); iter!=maDPDataCaches.end(); ++iter ) { if ( nID == (*iter)->GetId() ) { ScDPTableDataCache* pCache = *iter; - m_listDPObjectsCaches.erase( iter ); + maDPDataCaches.erase( iter ); delete pCache; break; } @@ -2699,7 +2699,7 @@ long ScDPCollection::GetNewDPObjectCacheId() bool bFound = false; std::list<ScDPTableDataCache*>::iterator iter; do { - for ( iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); ++iter ) + for ( iter = maDPDataCaches.begin(); iter!=maDPDataCaches.end(); ++iter ) { //Get a new Id if ( nID == (*iter)->GetId() ) { @@ -2708,7 +2708,7 @@ long ScDPCollection::GetNewDPObjectCacheId() break; } } - if ( iter == m_listDPObjectsCaches.end() ) + if ( iter == maDPDataCaches.end() ) bFound = false; } while ( bFound ); |