diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-06-26 00:37:36 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-26 09:29:25 +0200 |
| commit | 20c4a9ce69e73a182d60718e9b52510d66c8f20e (patch) | |
| tree | dde947221cfa9d662156416f01c0e4cbf4614c04 /basctl | |
| parent | personalisation: check "Own Theme" button when clicking "Select Theme" (diff) | |
| download | core-20c4a9ce69e73a182d60718e9b52510d66c8f20e.tar.gz core-20c4a9ce69e73a182d60718e9b52510d66c8f20e.zip | |
tdf#96099 Remove some trivial container iterator typedefs
Change-Id: Ifec98748d55ff6aca64c425c50c2cf2650f61591
Reviewed-on: https://gerrit.libreoffice.org/56422
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basides1.cxx | 16 | ||||
| -rw-r--r-- | basctl/source/inc/basidesh.hxx | 1 |
2 files changed, 8 insertions, 9 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index da1c86f1872d..02110e9c2632 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -153,13 +153,13 @@ void Shell::ExecuteSearch( SfxRequest& rReq ) { // search other modules... bool bChangeCurWindow = false; - WindowTableIt it; - for (it = aWindowTable.begin(); it != aWindowTable.end(); ++it) + auto it = aWindowTable.cbegin(); + for ( ; it != aWindowTable.cend(); ++it) if (it->second == pCurWin) break; - if (it != aWindowTable.end()) + if (it != aWindowTable.cend()) ++it; - BaseWindow* pWin = it != aWindowTable.end() ? it->second.get() : nullptr; + BaseWindow* pWin = it != aWindowTable.cend() ? it->second.get() : nullptr; bool bSearchedFromStart = false; while ( !nFound && !bCanceled && ( pWin || !bSearchedFromStart ) ) @@ -176,8 +176,8 @@ void Shell::ExecuteSearch( SfxRequest& rReq ) xQueryBox->set_default_response(RET_YES); if (xQueryBox->run() == RET_YES) { - it = aWindowTable.begin(); - if ( it != aWindowTable.end() ) + it = aWindowTable.cbegin(); + if ( it != aWindowTable.cend() ) pWin = it->second; bSearchedFromStart = true; } @@ -201,9 +201,9 @@ void Shell::ExecuteSearch( SfxRequest& rReq ) } if ( pWin && ( pWin != pCurWin ) ) { - if ( it != aWindowTable.end() ) + if ( it != aWindowTable.cend() ) ++it; - pWin = it != aWindowTable.end() ? it->second.get() : nullptr; + pWin = it != aWindowTable.cend() ? it->second.get() : nullptr; } else pWin = nullptr; diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index b6e8909efa65..5bf56c915afb 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -55,7 +55,6 @@ class Shell : { public: typedef std::map<sal_uInt16, VclPtr<BaseWindow> > WindowTable; - typedef WindowTable::const_iterator WindowTableIt; private: friend class JavaDebuggingListenerImpl; |