diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 08:53:25 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 10:45:27 +0000 |
commit | 58ba105a0328a932ff3dd86b043a909d01dacf5d (patch) | |
tree | 35d2e72bad7bc10cbc6ba7cfdc69023767c94521 /vcl | |
parent | 94ffeed68f14be4790fd537b8fb1431472613373 (diff) |
callcatcher: update unused code
Change-Id: Ia8e6abffb85b92ee4538fb0aeaee4e4aa18f2772
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/impimagetree.hxx | 5 | ||||
-rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 46 |
2 files changed, 0 insertions, 51 deletions
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 68cb2418271a..85e3640ece86 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -42,9 +42,6 @@ public: ~ImplImageTree(); - /// check whether the icon style is installed - bool checkStyle(OUString const & style); - bool loadImage( OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized = false, bool loadMissing = false ); @@ -77,7 +74,6 @@ private: OUString m_style; Path m_path; - CheckStyleCache m_checkStyleCache; IconCache m_iconCache; bool m_cacheIcons; IconLinkHash m_linkHash; @@ -86,7 +82,6 @@ private: void resetPaths(); - bool checkStyleCacheLookup( OUString const & style, bool &exists ); bool iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap ); bool find(std::vector< OUString > const & paths, BitmapEx & bitmap ); diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index e6722c679c0d..96aab03eeada 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -116,39 +116,6 @@ ImplImageTree::ImplImageTree() { m_cacheIcons = true; } ImplImageTree::~ImplImageTree() {} -bool ImplImageTree::checkStyle(OUString const & style) -{ - bool exists; - - // using cache because setStyle is an expensive operation - // setStyle calls resetPaths => closes any opened zip files with icons, cleans the icon cache, ... - if (checkStyleCacheLookup(style, exists)) { - return exists; - } - - setStyle(style); - - exists = false; - OUString aURL = m_path.first; - - osl::File aZip(aURL + ".zip"); - if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) { - aZip.close(); - exists = true; - } - - osl::Directory aLookaside(aURL); - if (aLookaside.open() == ::osl::FileBase::E_None) { - aLookaside.close(); - exists = true; - m_cacheIcons = false; - } else { - m_cacheIcons = true; - } - m_checkStyleCache[style] = exists; - return exists; -} - bool ImplImageTree::loadImage( OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized, bool loadMissing ) @@ -222,7 +189,6 @@ void ImplImageTree::shutDown() { m_style = OUString(); // for safety; empty m_style means "not initialized" m_iconCache.clear(); - m_checkStyleCache.clear(); m_linkHash.clear(); } @@ -254,18 +220,6 @@ void ImplImageTree::resetPaths() { url, css::uno::Reference< css::container::XNameAccess >()); } -bool ImplImageTree::checkStyleCacheLookup( - OUString const & style, bool &exists) -{ - CheckStyleCache::iterator i(m_checkStyleCache.find(style)); - if (i != m_checkStyleCache.end()) { - exists = i->second; - return true; - } else { - return false; - } -} - bool ImplImageTree::iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap) { |