commit 4c2034b808fed4f9dfd715d8a4813e788a7e97a4
author Noel Grandin <noel.grandin@collabora.co.uk> Thu May 16 16:52:19 2019 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Fri May 17 11:58:34 2019 +0200
tree e12e68a088540c3e3a9457186b5c72291aa78347
parent 0e4c542f7a862e681baf25f042bc3a928c14004f

avoid two lookups in ScDocument::GetLookupCache

doing an emplace_hint when the iterator points to end(), doesn't really
help, so rather attempt to insert a fake value

Change-Id: I44b89858284c6bebaa0e36daf0a4094fe06493c4
Reviewed-on: https://gerrit.libreoffice.org/72419
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sc/source/core/data/documen2.cxx

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 5650649..b87d73a 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1136,12 +1136,12 @@ ScLookupCache & ScDocument::GetLookupCache( const ScRange & rRange, ScInterprete
    ScLookupCacheMap*& rpCacheMap = pContext->mScLookupCache;
    if (!rpCacheMap)
        rpCacheMap = new ScLookupCacheMap;
    auto findIt(rpCacheMap->aCacheMap.find(rRange));
    if (findIt == rpCacheMap->aCacheMap.end())
    // insert with temporary value to avoid doing two lookups
    auto [findIt, bInserted] = rpCacheMap->aCacheMap.emplace(rRange, nullptr);
    if (bInserted)
    {
        auto insertIt = rpCacheMap->aCacheMap.emplace_hint(findIt,
                    rRange, std::make_unique<ScLookupCache>(this, rRange, *rpCacheMap) );
        pCache = insertIt->second.get();
        findIt->second = std::make_unique<ScLookupCache>(this, rRange, *rpCacheMap);
        pCache = findIt->second.get();
        // The StartListeningArea() call is not thread-safe, as all threads
        // would access the same SvtBroadcaster.
        osl::MutexGuard guard( mScLookupMutex );