summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-03-29 16:32:01 +0200
committerTor Lillqvist <tml@collabora.com>2019-09-20 13:04:05 +0200
commit638ccbc07d2dea12bdc4df528df4b6d8e12ddd2c (patch)
treeec493b127c72ba4a516ab31a8bbe19793a95724c
parentUse SAL_FALLTHROUGH (diff)
downloadcore-638ccbc07d2dea12bdc4df528df4b6d8e12ddd2c.tar.gz
core-638ccbc07d2dea12bdc4df528df4b6d8e12ddd2c.zip
Use the colibre icon theme in Online and apps
Change-Id: Idb79b3d4b1f14712f2e03d17fca6bec56f317edf Reviewed-on: https://gerrit.libreoffice.org/79193 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--vcl/source/app/IconThemeSelector.cxx5
1 files changed, 5 insertions, 0 deletions
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");