diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-29 09:29:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-29 11:28:49 +0200 |
| commit | 60e7bf52450aaa20aa3ad9f10d32db590879e8c2 (patch) | |
| tree | 897e42c9658770c868bcff4330d2f15ebfece801 /vcl | |
| parent | 101eea01c778ad255d3c8467e06643b23ff6bd76 (diff) | |
clean up iterator code in SystemDependentDataBuffer
Change-Id: I5f0cd0884b6490ae3018de13e3508b76e201d55f
Reviewed-on: https://gerrit.libreoffice.org/71507
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svdata.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 5613e8aa7b73..93335d48624b 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -115,8 +115,7 @@ namespace public: SystemDependentDataBuffer(const sal_Char* pDebugName) : basegfx::SystemDependentDataManager(), - maTimer(std::make_unique<AutoTimer>(pDebugName)), - maEntries() + maTimer(std::make_unique<AutoTimer>(pDebugName)) { maTimer->SetTimeout(1000); maTimer->SetInvokeHandler(LINK(this, SystemDependentDataBuffer, implTimeoutHdl)); @@ -168,7 +167,6 @@ namespace void flushAll() override { ::osl::MutexGuard aGuard(m_aMutex); - EntryMap::iterator aIter(maEntries.begin()); if(maTimer) { @@ -176,12 +174,7 @@ namespace maTimer.reset(); } - while(aIter != maEntries.end()) - { - EntryMap::iterator aDelete(aIter); - ++aIter; - maEntries.erase(aDelete); - } + maEntries.clear(); } }; @@ -199,9 +192,7 @@ namespace } else { - EntryMap::iterator aDelete(aIter); - ++aIter; - maEntries.erase(aDelete); + aIter = maEntries.erase(aIter); } } |