summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-03 17:38:03 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2018-10-05 16:45:57 +0200
commit2e4e28004439c9d0cdd6414fbda6d41c0c000a42 (patch)
treec1d1f6d44afad97c6d76b9f7b29eae4f70d63a49 /vcl
parent9bc004d6187da610e146527585c678b5cd9432ae (diff)
Resolves: tdf#120175 normalize theme names to our naming scheme
So breeze-dark turns into breeze_dark Change-Id: Id5d06f73a79f099048b31fd16f9f9611236af392 Reviewed-on: https://gerrit.libreoffice.org/61321 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f317a3de7473de5e6366ba4f2a4aa0ca25cdfdc1) Reviewed-on: https://gerrit.libreoffice.org/61404 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/IconThemeSelector.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index c9da2d6895c3..3665d1ace8dc 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -130,7 +130,9 @@ IconThemeSelector::SetUseHighContrastTheme(bool v)
void
IconThemeSelector::SetPreferredIconTheme(const OUString& theme, bool bDarkIconTheme)
{
- mPreferredIconTheme = theme;
+ // lower case theme name, and (tdf#120175) replace - with _
+ // see icon-themes/README
+ mPreferredIconTheme = theme.toAsciiLowerCase().replace('-','_');
mPreferDarkIconTheme = bDarkIconTheme;
}