Modernize a bit forms

by using for-range loops
+ use returned iterator by erase call

Change-Id: Ia41c9fae190dbad6a25b62a9b15ad51e89dd2906
Reviewed-on: https://gerrit.libreoffice.org/48759
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

1 files changed, 36 insertions, 54 deletions

diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 89f2e7a6ad66..7c7186e11905 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -93,22 +93,19 @@ namespace frm
 
     void SAL_CALL OFormNavigationHelper::statusChanged( const FeatureStateEvent& _rState )
     {
-        for (   FeatureMap::iterator aFeature = m_aSupportedFeatures.begin();
-                aFeature != m_aSupportedFeatures.end();
-                ++aFeature
-            )
+        for (auto & feature : m_aSupportedFeatures)
         {
-            if ( aFeature->second.aURL.Main == _rState.FeatureURL.Main )
+            if ( feature.second.aURL.Main == _rState.FeatureURL.Main )
             {
-                if  (  ( aFeature->second.bCachedState != bool(_rState.IsEnabled) )
-                    || ( aFeature->second.aCachedAdditionalState != _rState.State )
+                if  (  ( feature.second.bCachedState != bool(_rState.IsEnabled) )
+                    || ( feature.second.aCachedAdditionalState != _rState.State )
                     )
                 {
                     // change the cached state
-                    aFeature->second.bCachedState           = _rState.IsEnabled;
-                    aFeature->second.aCachedAdditionalState = _rState.State;
+                    feature.second.bCachedState           = _rState.IsEnabled;
+                    feature.second.aCachedAdditionalState = _rState.State;
                     // tell derivees what happened
-                    featureStateChanged( aFeature->first, _rState.IsEnabled );
+                    featureStateChanged( feature.first, _rState.IsEnabled );
                 }
                 return;
             }
@@ -124,20 +121,17 @@ namespace frm
         // was it one of our external dispatchers?
         if ( m_nConnectedFeatures )
         {
-            for (   FeatureMap::iterator aFeature = m_aSupportedFeatures.begin();
-                    aFeature != m_aSupportedFeatures.end();
-                    ++aFeature
-                )
+            for (auto & feature : m_aSupportedFeatures)
             {
-                if ( aFeature->second.xDispatcher == _rSource.Source )
+                if ( feature.second.xDispatcher == _rSource.Source )
                 {
-                    aFeature->second.xDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL );
-                    aFeature->second.xDispatcher = nullptr;
-                    aFeature->second.bCachedState = false;
-                    aFeature->second.aCachedAdditionalState.clear();
+                    feature.second.xDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), feature.second.aURL );
+                    feature.second.xDispatcher = nullptr;
+                    feature.second.bCachedState = false;
+                    feature.second.aCachedAdditionalState.clear();
                     --m_nConnectedFeatures;
 
-                    featureStateChanged( aFeature->first, false );
+                    featureStateChanged( feature.first, false );
                     break;
                 }
             }
@@ -160,29 +154,26 @@ namespace frm
         Reference< XDispatch >  xNewDispatcher;
         Reference< XDispatch >  xCurrentDispatcher;
 
-        for (   FeatureMap::iterator aFeature = m_aSupportedFeatures.begin();
-                aFeature != m_aSupportedFeatures.end();
-                ++aFeature
-            )
+        for (auto & feature : m_aSupportedFeatures)
         {
-            xNewDispatcher = queryDispatch( aFeature->second.aURL );
-            xCurrentDispatcher = aFeature->second.xDispatcher;
+            xNewDispatcher = queryDispatch( feature.second.aURL );
+            xCurrentDispatcher = feature.second.xDispatcher;
             if ( xNewDispatcher != xCurrentDispatcher )
             {
                 // the dispatcher for this particular URL changed
                 if ( xCurrentDispatcher.is() )
-                    xCurrentDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL );
+                    xCurrentDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), feature.second.aURL );
 
-                xCurrentDispatcher = aFeature->second.xDispatcher = xNewDispatcher;
+                xCurrentDispatcher = feature.second.xDispatcher = xNewDispatcher;
 
                 if ( xCurrentDispatcher.is() )
-                    xCurrentDispatcher->addStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL );
+                    xCurrentDispatcher->addStatusListener( static_cast< XStatusListener* >( this ), feature.second.aURL );
             }
 
             if ( xCurrentDispatcher.is() )
                 ++m_nConnectedFeatures;
             else
-                aFeature->second.bCachedState = false;
+                feature.second.bCachedState = false;
         }
 
         // notify derivee that (potentially) all features changed their state
@@ -202,18 +193,15 @@ namespace frm
 
         m_nConnectedFeatures = 0;
 
-        for (   FeatureMap::iterator aFeature = m_aSupportedFeatures.begin();
-                aFeature != m_aSupportedFeatures.end();
-                ++aFeature
-            )
+        for (auto & feature : m_aSupportedFeatures)
         {
-            aFeature->second.bCachedState = false;
-            aFeature->second.aCachedAdditionalState.clear();
-            aFeature->second.xDispatcher = queryDispatch( aFeature->second.aURL );
-            if ( aFeature->second.xDispatcher.is() )
+            feature.second.bCachedState = false;
+            feature.second.aCachedAdditionalState.clear();
+            feature.second.xDispatcher = queryDispatch( feature.second.aURL );
+            if ( feature.second.xDispatcher.is() )
             {
                 ++m_nConnectedFeatures;
-                aFeature->second.xDispatcher->addStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL );
+                feature.second.xDispatcher->addStatusListener( static_cast< XStatusListener* >( this ), feature.second.aURL );
             }
         }
 
@@ -226,17 +214,14 @@ namespace frm
     {
         if ( m_nConnectedFeatures )
         {
-            for (   FeatureMap::iterator aFeature = m_aSupportedFeatures.begin();
-                    aFeature != m_aSupportedFeatures.end();
-                    ++aFeature
-                )
+            for (auto & feature : m_aSupportedFeatures)
             {
-                if ( aFeature->second.xDispatcher.is() )
-                    aFeature->second.xDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL );
+                if ( feature.second.xDispatcher.is() )
+                    feature.second.xDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), feature.second.aURL );
 
-                aFeature->second.xDispatcher = nullptr;
-                aFeature->second.bCachedState = false;
-                aFeature->second.aCachedAdditionalState.clear();
+                feature.second.xDispatcher = nullptr;
+                feature.second.bCachedState = false;
+                feature.second.aCachedAdditionalState.clear();
             }
 
             m_nConnectedFeatures = 0;
@@ -257,20 +242,17 @@ namespace frm
 
             OFormNavigationMapper aUrlMapper( m_xORB );
 
-            for (   ::std::vector< sal_Int16 >::const_iterator aLoop = aFeatureIds.begin();
-                    aLoop != aFeatureIds.end();
-                    ++aLoop
-                )
+            for (auto const& feature : aFeatureIds)
             {
                 FeatureInfo aFeatureInfo;
 
                 bool bKnownId =
-                    aUrlMapper.getFeatureURL( *aLoop, aFeatureInfo.aURL );
+                    aUrlMapper.getFeatureURL( feature, aFeatureInfo.aURL );
                 DBG_ASSERT( bKnownId, "OFormNavigationHelper::initializeSupportedFeatures: unknown feature id!" );
 
                 if ( bKnownId )
                     // add to our map
-                    m_aSupportedFeatures.emplace( *aLoop, aFeatureInfo );
+                    m_aSupportedFeatures.emplace( feature, aFeatureInfo );
             }
         }
     }