use internal iterator for SfxBroadcaster

So we can avoid exposing the internal listener vector.
(which allows further optimisations)

Change-Id: If288141a37314dcc01d203029dc51c71ec2b7f54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152857
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 7 insertions, 8 deletions

diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index b6dd018e6474..8ae6879ef337 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -260,15 +260,14 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS
         // #i29181#
         // If the SdrObject which is about to be deleted is in any selection,
         // deselect it first.
-        SdrViewIter aIter( pSdrShape );
-
-        for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
-        {
-            if(SAL_MAX_SIZE != pView->TryToFindMarkedObject(pSdrShape))
+        SdrViewIter::ForAllViews( pSdrShape,
+            [&pSdrShape] (SdrView* pView)
             {
-                pView->MarkObj(pSdrShape, pView->GetSdrPageView(), true);
-            }
-        }
+                if(SAL_MAX_SIZE != pView->TryToFindMarkedObject(pSdrShape))
+                {
+                    pView->MarkObj(pSdrShape, pView->GetSdrPageView(), true);
+                }
+            });
 
         rList.NbcRemoveObject( nObjNum );
     }