diff options
Diffstat (limited to 'svtools/source/uno')
-rw-r--r-- | svtools/source/uno/statusbarcontroller.cxx | 29 | ||||
-rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 38 | ||||
-rw-r--r-- | svtools/source/uno/unocontroltablemodel.cxx | 81 | ||||
-rw-r--r-- | svtools/source/uno/unoimap.cxx | 8 |
4 files changed, 53 insertions, 103 deletions
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index fbd5f80001e6..c7cb62ac1903 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -195,14 +195,13 @@ void SAL_CALL StatusbarController::dispose() SolarMutexGuard aSolarMutexGuard; Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XURLTransformer > xURLTransformer = getURLTransformer(); - URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); css::util::URL aTargetURL; - while ( pIter != m_aListenerMap.end() ) + for (auto const& listener : m_aListenerMap) { try { - Reference< XDispatch > xDispatch( pIter->second ); - aTargetURL.Complete = pIter->first; + Reference< XDispatch > xDispatch(listener.second); + aTargetURL.Complete = listener.first; xURLTransformer->parseStrict( aTargetURL ); if ( xDispatch.is() && xStatusListener.is() ) @@ -211,8 +210,6 @@ void SAL_CALL StatusbarController::dispose() catch ( Exception& ) { } - - ++pIter; } // clear hash map @@ -258,13 +255,11 @@ void SAL_CALL StatusbarController::disposing( const EventObject& Source ) if ( !xDispatch.is() ) return; - URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); - while ( pIter != m_aListenerMap.end() ) + for (auto & listener : m_aListenerMap) { // Compare references and release dispatch references if they are equal. - if ( xDispatch == pIter->second ) - pIter->second.clear(); - ++pIter; + if ( xDispatch == listener.second ) + listener.second.clear(); } } @@ -420,15 +415,14 @@ void StatusbarController::bindListener() if ( m_xContext.is() && xDispatchProvider.is() ) { xStatusListener.set( static_cast< OWeakObject* >( this ), UNO_QUERY ); - URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); - while ( pIter != m_aListenerMap.end() ) + for (auto & listener : m_aListenerMap) { Reference< XURLTransformer > xURLTransformer = getURLTransformer(); css::util::URL aTargetURL; - aTargetURL.Complete = pIter->first; + aTargetURL.Complete = listener.first; xURLTransformer->parseStrict( aTargetURL ); - Reference< XDispatch > xDispatch( pIter->second ); + Reference< XDispatch > xDispatch(listener.second); if ( xDispatch.is() ) { // We already have a dispatch object => we have to requery. @@ -442,7 +436,7 @@ void StatusbarController::bindListener() } } - pIter->second.clear(); + listener.second.clear(); xDispatch.clear(); // Query for dispatch object. Old dispatch will be released with this, too. @@ -453,11 +447,10 @@ void StatusbarController::bindListener() catch ( Exception& ) { } - pIter->second = xDispatch; + listener.second = xDispatch; Listener aListener( aTargetURL, xDispatch ); aDispatchVector.push_back( aListener ); - ++pIter; } } } diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index e123da5a4c50..e4affa417bb5 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -243,15 +243,14 @@ void SAL_CALL ToolboxController::dispose() SolarMutexGuard aSolarMutexGuard; Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); - URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); - while ( pIter != m_aListenerMap.end() ) + for (auto const& listener : m_aListenerMap) { try { - Reference< XDispatch > xDispatch( pIter->second ); + Reference< XDispatch > xDispatch( listener.second ); css::util::URL aTargetURL; - aTargetURL.Complete = pIter->first; + aTargetURL.Complete = listener.first; if ( m_xUrlTransformer.is() ) m_xUrlTransformer->parseStrict( aTargetURL ); @@ -262,7 +261,6 @@ void SAL_CALL ToolboxController::dispose() { } - ++pIter; } m_bDisposed = true; @@ -288,14 +286,12 @@ void SAL_CALL ToolboxController::disposing( const EventObject& Source ) if ( m_bDisposed ) return; - URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); - while ( pIter != m_aListenerMap.end() ) + for (auto & listener : m_aListenerMap) { // Compare references and release dispatch references if they are equal. - Reference< XInterface > xIfac( pIter->second, UNO_QUERY ); + Reference< XInterface > xIfac(listener.second, UNO_QUERY); if ( xSource == xIfac ) - pIter->second.clear(); - ++pIter; + listener.second.clear(); } Reference< XInterface > xIfac( m_xFrame, UNO_QUERY ); @@ -481,15 +477,14 @@ void ToolboxController::bindListener() if ( m_xContext.is() && xDispatchProvider.is() ) { xStatusListener.set( static_cast< OWeakObject* >( this ), UNO_QUERY ); - URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); - while ( pIter != m_aListenerMap.end() ) + for (auto & listener : m_aListenerMap) { css::util::URL aTargetURL; - aTargetURL.Complete = pIter->first; + aTargetURL.Complete = listener.first; if ( m_xUrlTransformer.is() ) m_xUrlTransformer->parseStrict( aTargetURL ); - Reference< XDispatch > xDispatch( pIter->second ); + Reference< XDispatch > xDispatch(listener.second); if ( xDispatch.is() ) { // We already have a dispatch object => we have to requery. @@ -503,7 +498,7 @@ void ToolboxController::bindListener() } } - pIter->second.clear(); + listener.second.clear(); xDispatch.clear(); // Query for dispatch object. Old dispatch will be released with this, too. @@ -514,11 +509,10 @@ void ToolboxController::bindListener() catch ( Exception& ) { } - pIter->second = xDispatch; + listener.second = xDispatch; Listener aListener( aTargetURL, xDispatch ); aDispatchVector.push_back( aListener ); - ++pIter; } } } @@ -570,15 +564,14 @@ void ToolboxController::unbindListener() return; Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); - URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); - while ( pIter != m_aListenerMap.end() ) + for (auto & listener : m_aListenerMap) { css::util::URL aTargetURL; - aTargetURL.Complete = pIter->first; + aTargetURL.Complete = listener.first; if ( m_xUrlTransformer.is() ) m_xUrlTransformer->parseStrict( aTargetURL ); - Reference< XDispatch > xDispatch( pIter->second ); + Reference< XDispatch > xDispatch(listener.second); if ( xDispatch.is() ) { // We already have a dispatch object => we have to requery. @@ -591,8 +584,7 @@ void ToolboxController::unbindListener() { } } - pIter->second.clear(); - ++pIter; + listener.second.clear(); } } diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx index c69e89f9b1fc..fd982321debd 100644 --- a/svtools/source/uno/unocontroltablemodel.cxx +++ b/svtools/source/uno/unocontroltablemodel.cxx @@ -223,12 +223,9 @@ namespace svt { namespace table // notify listeners ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->columnInserted(); + listener->columnInserted(); } } @@ -246,12 +243,9 @@ namespace svt { namespace table // notify listeners ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->columnRemoved(); + listener->columnRemoved(); } // dispose the column @@ -269,12 +263,9 @@ namespace svt { namespace table return; // dispose the column instances - for ( ColumnModels::const_iterator col = m_pImpl->aColumns.begin(); - col != m_pImpl->aColumns.end(); - ++col - ) + for (auto const& col : m_pImpl->aColumns) { - UnoGridColumnFacade* pColumn = dynamic_cast< UnoGridColumnFacade* >( col->get() ); + UnoGridColumnFacade* pColumn = dynamic_cast< UnoGridColumnFacade* >( col.get() ); if ( !pColumn ) { SAL_WARN( "svtools.uno", "UnoControlTableModel::removeAllColumns: illegal column implementation!" ); @@ -287,12 +278,9 @@ namespace svt { namespace table // notify listeners ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->allColumnsRemoved(); + listener->allColumnsRemoved(); } } @@ -300,12 +288,9 @@ namespace svt { namespace table void UnoControlTableModel::impl_notifyTableMetricsChanged() const { ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->tableMetricsChanged(); + listener->tableMetricsChanged(); } } @@ -741,13 +726,12 @@ namespace svt { namespace table ColPos UnoControlTableModel::getColumnPos( UnoGridColumnFacade const & i_column ) const { DBG_CHECK_ME(); - for ( ColumnModels::const_iterator col = m_pImpl->aColumns.begin(); - col != m_pImpl->aColumns.end(); - ++col - ) + ColPos nPos = 0; + for (auto const& col : m_pImpl->aColumns) { - if ( &i_column == col->get() ) - return col - m_pImpl->aColumns.begin(); + if ( &i_column == col.get() ) + return nPos; + ++nPos; } OSL_ENSURE( false, "UnoControlTableModel::getColumnPos: column not found!" ); return COL_INVALID; @@ -822,12 +806,9 @@ namespace svt { namespace table "UnoControlTableModel::notifyColumnChange: invalid column index!" ); ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->columnChanged( i_columnPos, i_attributeGroup ); + listener->columnChanged( i_columnPos, i_attributeGroup ); } } @@ -859,12 +840,9 @@ namespace svt { namespace table // multiplex the event to our own listeners ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->rowsInserted( i_event.FirstRow, i_event.LastRow ); + listener->rowsInserted( i_event.FirstRow, i_event.LastRow ); } } @@ -872,12 +850,9 @@ namespace svt { namespace table void UnoControlTableModel::notifyRowsRemoved( GridDataEvent const & i_event ) const { ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->rowsRemoved( i_event.FirstRow, i_event.LastRow ); + listener->rowsRemoved( i_event.FirstRow, i_event.LastRow ); } } @@ -888,12 +863,9 @@ namespace svt { namespace table RowPos const lastRow = i_event.FirstRow == -1 ? getRowCount() - 1 : i_event.LastRow; ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->cellsUpdated( firstRow, lastRow ); + listener->cellsUpdated( firstRow, lastRow ); } } @@ -901,12 +873,9 @@ namespace svt { namespace table void UnoControlTableModel::notifyAllDataChanged() const { ModellListeners aListeners( m_pImpl->m_aListeners ); - for ( ModellListeners::const_iterator loop = aListeners.begin(); - loop != aListeners.end(); - ++loop - ) + for (auto const& listener : aListeners) { - (*loop)->cellsUpdated( 0, getRowCount() - 1 ); + listener->cellsUpdated( 0, getRowCount() - 1 ); } } diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 6a0fafaa93d8..65757ccbda15 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -673,15 +673,11 @@ bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const rMap.SetName( maName ); - auto aIter = maObjectList.begin(); - auto const aEnd = maObjectList.end(); - while( aIter != aEnd ) + for (auto const& elem : maObjectList) { - IMapObject* pNewMapObject = (*aIter)->createIMapObject(); + IMapObject* pNewMapObject = elem->createIMapObject(); rMap.InsertIMapObject( *pNewMapObject ); delete pNewMapObject; - - ++aIter; } return true; |