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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 638ccbc07d2dea12bdc4df528df4b6d8e12ddd2c
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 Sep 20 13:04:05 2019 +0200

    Use the colibre icon theme in Online and apps
    
    Change-Id: Idb79b3d4b1f14712f2e03d17fca6bec56f317edf
    Reviewed-on: https://gerrit.libreoffice.org/79193
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index d0454c37fb34..92998724c34f 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>
@@ -51,6 +53,9 @@ IconThemeSelector::IconThemeSelector()
 /*static*/ OUString
 IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment)
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return OUString("colibre");
+
 #ifdef _WIN32
     (void)desktopEnvironment;
     return OUString("colibre");