diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-07-26 16:48:46 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-26 17:00:23 +0100 |
| commit | 5d071dda3701289ad73c786446ba2e054e74a388 (patch) | |
| tree | 35eb6c9ec44108a1f3b349c7221aa0658033f194 /vcl | |
| parent | 44ddacb232c4fd5cbb28867aa28d7d855788a511 (diff) | |
Rename misleading icon link data from cache to hash.
Change-Id: Iefce4992e7a0180cba57ea35fb51d077c642af80
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/impimagetree.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 05f7ad003882..a24faaa834ce 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -73,14 +73,14 @@ private: typedef boost::unordered_map< OUString, std::pair< bool, BitmapEx >, OUStringHash > IconCache; typedef boost::unordered_map< - OUString, OUString, OUStringHash > IconLinkCache; + OUString, OUString, OUStringHash > IconLinkHash; OUString m_style; Path m_path; CheckStyleCache m_checkStyleCache; IconCache m_iconCache; bool m_cacheIcons; - IconLinkCache m_iconLinkCache; + IconLinkHash m_linkHash; void setStyle(OUString const & style ); diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 1bb37cab1fd1..6e60d0edeb5a 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -223,7 +223,7 @@ void ImplImageTree::shutDown() { // for safety; empty m_style means "not initialized" m_iconCache.clear(); m_checkStyleCache.clear(); - m_iconLinkCache.clear(); + m_linkHash.clear(); } void ImplImageTree::setStyle(OUString const & style) { @@ -232,7 +232,7 @@ void ImplImageTree::setStyle(OUString const & style) { m_style = style; resetPaths(); m_iconCache.clear(); - m_iconLinkCache.clear(); + m_linkHash.clear(); loadImageLinks(); } } @@ -378,14 +378,14 @@ void ImplImageTree::parseLinkFile(boost::shared_ptr< SvStream > pStream) "Link is incomplete." ); continue; } - m_iconLinkCache[aLink] = aOriginal; + m_linkHash[aLink] = aOriginal; } } OUString const & ImplImageTree::getRealImageName(OUString const & name) { - IconLinkCache::iterator it(m_iconLinkCache.find(name)); - if (it == m_iconLinkCache.end()) + IconLinkHash::iterator it(m_linkHash.find(name)); + if (it == m_linkHash.end()) return name; return it->second; } |