diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-08-22 13:40:01 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-08-22 14:09:16 +0200 |
commit | cf2c056bf0fbc6d52eaa670022016562d6f15bc3 (patch) | |
tree | e13c667146a45ca45c50f644076ef720e4f9c9bf /vcl/source/app | |
parent | 0bcefcabdd86b11810b64d1166cfb2386717367b (diff) |
remove special casing for default theme in vcl
Change-Id: I4d7a37ab9b31fcce7704f07d883d6f7806f066ec
Diffstat (limited to 'vcl/source/app')
-rw-r--r-- | vcl/source/app/IconThemeInfo.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx index 5e1834891837..88d517cf93cc 100644 --- a/vcl/source/app/IconThemeInfo.cxx +++ b/vcl/source/app/IconThemeInfo.cxx @@ -60,7 +60,7 @@ IconThemeInfo::SizeByThemeName(const OUString& themeName) else if (themeName == "crystal") { return Size( 22, 22 ); } - else if (themeName == "default") { + else if (themeName == "galaxy") { return Size( 22, 22 ); } else { @@ -76,10 +76,6 @@ IconThemeInfo::UrlCanBeParsed(const OUString& url) return false; } - if (fname == "default.zip") { - return true; - } - if (!fname.startsWithIgnoreAsciiCase(ICON_THEME_PACKAGE_PREFIX)) { return false; } @@ -94,9 +90,6 @@ IconThemeInfo::UrlCanBeParsed(const OUString& url) /*static*/ OUString IconThemeInfo::FileNameToThemeId(const OUString& filename) { - if (filename == "default.zip") { - return OUString("default"); - } OUString r; sal_Int32 positionOfLastDot = filename.lastIndexOf(EXTENSION_FOR_ICON_PACKAGES); if (positionOfLastDot < 0) { // -1 means index not found @@ -118,10 +111,6 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString& themeId) throw std::runtime_error("IconThemeInfo::ThemeIdToDisplayName() called with invalid id."); } - if (themeId == "default") { - return OUString("Galaxy"); - } - // make the first letter uppercase OUString r; sal_Unicode firstLetter = themeId[0]; |