[Libreoffice-commits] core.git: vcl/source

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 26 19:58:57 UTC 2019


 vcl/source/app/IconThemeSelector.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 43b58a829b3ffdb6169cebe657fd00df69877a71
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 29 16:32:01 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 26 21:57:58 2019 +0200

    Use the colibre icon theme in Online and apps
    
    Change-Id: Idb79b3d4b1f14712f2e03d17fca6bec56f317edf
    Reviewed-on: https://gerrit.libreoffice.org/76379
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index ff2dcc52805a..bf3953b755ba 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <comphelper/lok.hxx>
+
 #include <vcl/IconThemeSelector.hxx>
 
 #include <vcl/IconThemeInfo.hxx>
@@ -50,6 +52,9 @@ IconThemeSelector::IconThemeSelector()
 /*static*/ OUString
 IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment)
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return OUString("colibre");
+
 #ifdef _WIN32
     (void)desktopEnvironment;
     return OUString("colibre");


More information about the Libreoffice-commits mailing list