mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Theme icons are loaded only once

Browse Source 
With the theme icon cleaning commit
d5151ab592, 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@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/5943
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Rodolfo Ribeiro Gomes
2013-09-14 19:27:50 -03:00
committed by Caolán McNamara
parent 4da39c170f
commit 58d8a11a1b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vcl/source/gdi/impimagetree.cxx
View File

@@ -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(