[Libreoffice-commits] core.git: vcl/source

[Rodolfo Ribeiro Gomes]

 vcl/source/gdi/impimagetree.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 58d8a11a1b44d5f07c43f96c7e4ab03dc549ef27
Author: Rodolfo Ribeiro Gomes <rodolforg at gmail.com>
Date:   Sat Sep 14 19:27:50 2013 -0300

    Theme icons are loaded only once
    
    With the theme icon cleaning commit
    d5151ab592367fde7db03fce81e0b76776d18216, duplicated
    icons (same icon for multiple actions) doesn't need to
    be stored in different files. The file links.txt inside
    the theme pack can handle filename redirections.
    So, it keeps the theme pack smaller. However, the
    duplicates keep being loaded, because they use different
    names.
    
    With this patch, the names of those duplicates are mapped
    also when querying for the icons. This way, an icon is
    loaded only once, saving RAM.
    
    Change-Id: Ieb5b8424c1515f0033276bf314cdef02a4e01862
    Signed-off-by: Rodolfo Ribeiro Gomes <rodolforg at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/5943
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 4d549f0..1c67667 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -270,13 +270,12 @@ bool ImplImageTree::checkStyleCacheLookup(
 bool ImplImageTree::iconCacheLookup(
     OUString const & name, bool localized, BitmapEx & bitmap)
 {
-    IconCache::iterator i(m_iconCache.find(name));
+    IconCache::iterator i(m_iconCache.find(getRealImageName(name)));
     if (i != m_iconCache.end() && i->second.first == localized) {
         bitmap = i->second.second;
         return true;
-    } else {
-        return false;
     }
+    return false;
 }
 
 bool ImplImageTree::find(