chart2: replace for_each with range-based for

Replace complex uses of ::std::for_each with a range-based for-loop.

Change-Id: I6f3d8488a63a5bed271ab70ad6f024e9869906cc
Reviewed-on: https://gerrit.libreoffice.org/19143
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>

1 files changed, 8 insertions, 21 deletions

diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 4886210cce6b..592d8a501a21 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -33,31 +33,18 @@ using ::com::sun::star::uno::Sequence;
 namespace
 {
 template< class Map >
-    struct lcl_DisposeAndClearAndDeleteMapElement :
-        public ::std::unary_function< typename Map::value_type, void >
-    {
-        explicit lcl_DisposeAndClearAndDeleteMapElement( const Reference< uno::XInterface > & xEventSource ) :
-                m_aEvent( xEventSource )
-        {}
-        void operator() ( typename Map::value_type & rElement )
-        {
-            if( rElement.second )
-            {
-                rElement.second->disposeAndClear( m_aEvent );
-                delete rElement.second;
-            }
-        }
-    private:
-        lang::EventObject m_aEvent;
-    };
-
-template< class Map >
     void lcl_DisposeAndClearAndDeleteAllMapElements(
         Map & rMap,
         const Reference< uno::XInterface > & xEventSource )
 {
-    ::std::for_each( rMap.begin(), rMap.end(),
-                     lcl_DisposeAndClearAndDeleteMapElement< Map >( xEventSource ));
+    for( const auto& rElement : rMap )
+    {
+        if( rElement.second )
+        {
+            rElement.second->disposeAndClear( xEventSource );
+            delete rElement.second;
+        }
+    }
 }
 
 } // anonymous namespace