[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source

[Tor Lillqvist (via logerrit)]

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

New commits:
commit e608dca4f4c99631ebd4d4dfa02f0e28a625cdba
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 29 16:32:01 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Mar 29 16:32:01 2019 +0200

    Use the colibre icon theme in Online and apps
    
    Change-Id: Idb79b3d4b1f14712f2e03d17fca6bec56f317edf

diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index 2f976d9cb8c0..8a644fd39b3d 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/IconThemeScanner.hxx>
@@ -50,6 +52,9 @@ IconThemeSelector::IconThemeSelector()
 /*static*/ OUString
 IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment)
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return OUString("colibre");
+
     OUString r;
     if ( desktopEnvironment.equalsIgnoreAsciiCase("tde") ||
          desktopEnvironment.equalsIgnoreAsciiCase("kde") ) {