diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index fa53cf0d2208..4a06f66b2526 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -33,7 +33,7 @@ #include #include -#include +#include using namespace ::utl ; using namespace ::osl ; @@ -73,7 +73,7 @@ using namespace ::com::sun::star; class SvtMiscOptions_Impl : public ConfigItem { private: - ::std::list> aList; + ::std::vector> aList; bool m_bUseSystemFileDialog; bool m_bIsUseSystemFileDialogRO; bool m_bPluginsEnabled; @@ -521,20 +521,13 @@ void SvtMiscOptions_Impl::AddListenerLink( const Link& rLin void SvtMiscOptions_Impl::RemoveListenerLink( const Link& rLink ) { - for ( ::std::list>::iterator iter = aList.begin(); iter != aList.end(); ++iter ) - { - if ( *iter == rLink ) - { - aList.erase(iter); - break; - } - } + aList.erase(std::remove(aList.begin(), aList.end(), rLink), aList.end()); } void SvtMiscOptions_Impl::CallListeners() { - for ( ::std::list>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter ) - iter->Call( nullptr ); + for (auto const& elem : aList) + elem.Call( nullptr ); } void SvtMiscOptions_Impl::SetToolboxStyle( sal_Int16 nStyle ) diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 9073fe0fba07..7a4e1e3b6e44 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -323,7 +323,7 @@ struct TDataCntnrEntry_Impl }; -typedef ::std::list< TDataCntnrEntry_Impl > TDataCntnrEntryList; +typedef ::std::vector< TDataCntnrEntry_Impl > TDataCntnrEntryList; struct TransferDataContainer_Impl diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 58f95496182f..e7e7398dea72 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -536,7 +536,7 @@ public: private: OUString maName; - std::list< rtl::Reference > maObjectList; + std::vector< rtl::Reference > maObjectList; }; UNO3_GETIMPLEMENTATION_IMPL( SvUnoImageMap );