[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/README vcl/source

[Libreoffice Gerrit user]

 icon-themes/README                   |    1 +
 vcl/source/app/IconThemeSelector.cxx |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2e4e28004439c9d0cdd6414fbda6d41c0c000a42
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 3 17:38:03 2018 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Oct 5 16:45:57 2018 +0200

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit f317a3de7473de5e6366ba4f2a4aa0ca25cdfdc1)
    Reviewed-on: https://gerrit.libreoffice.org/61404
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/icon-themes/README b/icon-themes/README
index fc069f3a7598..e40683d40893 100644
--- a/icon-themes/README
+++ b/icon-themes/README
@@ -24,6 +24,7 @@ How to add a new image set:
          scp2 compilation crashes when using a dash '-'.
          It evidently splits the name into two strings.
    ^ It's probably not true anymore with filelists.
+   ^ if this gets changed, IconThemeSelector::SetPreferredIconTheme needs to change too
 
 - Add its name (new_set) to WITH_THEMES variable in configure.ac
 
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;
 }