diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-11-11 10:06:47 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-11-11 12:05:41 +0100 |
| commit | f9333f9d47eb8906b4ef74cbb0a09cf1a9a5f2e6 (patch) | |
| tree | a507027269bbb17d3b1ffc3c3fd89fe580ac638c /sc | |
| parent | b1309cb3bc4b1719b6c99d49baea51f4e96136cd (diff) | |
Replace list by vector in scmod (sc)
Change-Id: I5171de5a13861d36d30f8489b7d83768e8c2ac25
Reviewed-on: https://gerrit.libreoffice.org/44622
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/scmod.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index a5acf50dc2de..78a433e7d511 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -30,7 +30,7 @@ #include <unotools/options.hxx> #include <algorithm> -#include <list> +#include <vector> #include <map> #include <memory> #include <stack> @@ -107,7 +107,7 @@ class ScModule: public SfxModule, public SfxListener, public utl::ConfigurationL bool mbIsInSharedDocLoading:1; bool mbIsInSharedDocSaving:1; - std::map<sal_uInt16, std::list<VclPtr<vcl::Window> > > m_mapRefWindow; + std::map<sal_uInt16, std::vector<VclPtr<vcl::Window> > > m_mapRefWindow; public: SFX_DECL_INTERFACE(SCID_APP) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 414c8567bb93..a70db85be5bb 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2177,7 +2177,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) void ScModule::RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) { - std::list<VclPtr<vcl::Window> > & rlRefWindow = m_mapRefWindow[nSlotId]; + std::vector<VclPtr<vcl::Window> > & rlRefWindow = m_mapRefWindow[nSlotId]; if( std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ) == rlRefWindow.end() ) { @@ -2193,7 +2193,7 @@ void ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) if( iSlot == m_mapRefWindow.end() ) return; - std::list<VclPtr<vcl::Window> > & rlRefWindow = iSlot->second; + std::vector<VclPtr<vcl::Window> > & rlRefWindow = iSlot->second; auto i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ); @@ -2216,13 +2216,13 @@ vcl::Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAn if( iSlot == m_mapRefWindow.end() ) return nullptr; - std::list<VclPtr<vcl::Window> > & rlRefWindow = iSlot->second; + std::vector<VclPtr<vcl::Window> > & rlRefWindow = iSlot->second; while( vcl::Window *pParent = pWndAncestor->GetParent() ) pWndAncestor = pParent; - for( auto i = rlRefWindow.begin(); i!=rlRefWindow.end(); ++i ) - if ( pWndAncestor->IsWindowOrChild( *i, (*i)->IsSystemWindow() ) ) - return *i; + for (auto const& refWindow : rlRefWindow) + if ( pWndAncestor->IsWindowOrChild( refWindow, refWindow->IsSystemWindow() ) ) + return refWindow; return nullptr; } |