Kaydet (Commit) f9333f9d authored tarafından Julien Nabet's avatar Julien Nabet

Replace list by vector in scmod (sc)

Change-Id: I5171de5a13861d36d30f8489b7d83768e8c2ac25
Reviewed-on: https://gerrit.libreoffice.org/44622Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst b1309cb3
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <unotools/options.hxx> #include <unotools/options.hxx>
#include <algorithm> #include <algorithm>
#include <list> #include <vector>
#include <map> #include <map>
#include <memory> #include <memory>
#include <stack> #include <stack>
...@@ -107,7 +107,7 @@ class ScModule: public SfxModule, public SfxListener, public utl::ConfigurationL ...@@ -107,7 +107,7 @@ class ScModule: public SfxModule, public SfxListener, public utl::ConfigurationL
bool mbIsInSharedDocLoading:1; bool mbIsInSharedDocLoading:1;
bool mbIsInSharedDocSaving: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: public:
SFX_DECL_INTERFACE(SCID_APP) SFX_DECL_INTERFACE(SCID_APP)
......
...@@ -2177,7 +2177,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) ...@@ -2177,7 +2177,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void )
void ScModule::RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) 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() ) if( std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ) == rlRefWindow.end() )
{ {
...@@ -2193,7 +2193,7 @@ void ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) ...@@ -2193,7 +2193,7 @@ void ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd )
if( iSlot == m_mapRefWindow.end() ) if( iSlot == m_mapRefWindow.end() )
return; 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 ); auto i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd );
...@@ -2216,13 +2216,13 @@ vcl::Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAn ...@@ -2216,13 +2216,13 @@ vcl::Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAn
if( iSlot == m_mapRefWindow.end() ) if( iSlot == m_mapRefWindow.end() )
return nullptr; 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; while( vcl::Window *pParent = pWndAncestor->GetParent() ) pWndAncestor = pParent;
for( auto i = rlRefWindow.begin(); i!=rlRefWindow.end(); ++i ) for (auto const& refWindow : rlRefWindow)
if ( pWndAncestor->IsWindowOrChild( *i, (*i)->IsSystemWindow() ) ) if ( pWndAncestor->IsWindowOrChild( refWindow, refWindow->IsSystemWindow() ) )
return *i; return refWindow;
return nullptr; return nullptr;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment