Revert "A first step to refactor ShapeList (sd)"

This reverts commit c5857a0371dcc7977e68d48f08f2a3ecefb67b89.

Change-Id: I59326867bdf71dcf20a86e03499884452675c557
Reviewed-on: https://gerrit.libreoffice.org/44284
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>

1 files changed, 6 insertions, 3 deletions

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 3ac3b29568de..6d7358947ca6 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -199,9 +199,12 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc
     // first sort all matching shapes with z-order
     std::vector< SdrObject* > aMatches;
 
-    for (auto const& shape : maPresentationShapeList.getList())
+    SdrObject* pObj = nullptr;
+    maPresentationShapeList.seekShape(0);
+
+    while( (pObj = maPresentationShapeList.getNextShape()) )
     {
-        SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*shape);
+        SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj);
         if( pInfo )
         {
             bool bFound = false;
@@ -228,7 +231,7 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc
             }
             if( bFound )
             {
-                aMatches.push_back( shape );
+                aMatches.push_back( pObj );
             }
         }
     }