diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2012-02-09 02:14:05 +0100 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2012-02-09 02:14:05 +0100 |
commit | bd9d0aa967eb69e436925fc64b16051019e6818d (patch) | |
tree | 5ddea5ba64ef49b6cff7faae97c779b2c2aa6c0e /dbaccess | |
parent | ORowSetCache::moveWindow fix variable inversion; fixes subsequentcheck (diff) | |
download | core-bd9d0aa967eb69e436925fc64b16051019e6818d.tar.gz core-bd9d0aa967eb69e436925fc64b16051019e6818d.zip |
Revert "Tentative fix for invalid iterator range regression"
This reverts commit 23151ab53574e0e893f4507313ff15388638746a.
Fixed root cause in previous commit.
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/api/RowSetCache.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 04d143630803..f2301f0f6375 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -940,14 +940,7 @@ sal_Bool ORowSetCache::moveWindow() bCheck = fill(aIter, aNewEnd, nPos, bCheck); } - if ( aEnd <= aNewEnd ) - { - ::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd); - } - else - { - ::std::rotate(m_pMatrix->begin(), aNewEnd, aEnd); - } + ::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd); // now correct the iterator in our iterator vector // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); |