diff options
| -rw-r--r-- | vcl/inc/implimagetree.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx index 72cdd02d85cf..48773cc42c23 100644 --- a/vcl/inc/implimagetree.hxx +++ b/vcl/inc/implimagetree.hxx @@ -92,7 +92,7 @@ private: ImplImageTree& operator=(const ImplImageTree&) = delete; typedef std::unordered_map<OUString, std::pair<bool,BitmapEx>> IconCache; - typedef std::unordered_map<sal_Int32, std::unique_ptr<IconCache>> ScaledIconCache; + typedef std::unordered_map<sal_Int32, IconCache> ScaledIconCache; typedef std::unordered_map<OUString, OUString> IconLinkHash; struct IconSet diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 227b5981be52..263e63befef1 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -517,9 +517,9 @@ ImplImageTree::IconCache &ImplImageTree::getIconCache(const ImageRequestParamete IconSet &rSet = getCurrentIconSet(); auto it = rSet.maScaledIconCaches.find(rParameters.mnScalePercentage); if ( it != rSet.maScaledIconCaches.end() ) - return *it->second; - rSet.maScaledIconCaches[rParameters.mnScalePercentage] = std::make_unique<IconCache>(); - return *rSet.maScaledIconCaches[rParameters.mnScalePercentage]; + return it->second; + rSet.maScaledIconCaches.emplace(rParameters.mnScalePercentage, IconCache()); + return rSet.maScaledIconCaches[rParameters.mnScalePercentage]; } bool ImplImageTree::iconCacheLookup(ImageRequestParameters& rParameters) |