summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-05-18 14:16:31 +0300
committerTor Lillqvist <tml@collabora.com>2018-06-25 22:49:06 +0200
commit39c39d2e815f6621809d1d9850697e8835f0f386 (patch)
tree35d3262e765788876bf050b0434e487f4522a5f1
parentVersion 6.0.5.2, tag libreoffice-6.0.5.2 (diff)
downloadcore-distro/collabora/lov-6.0.5.tar.gz
core-distro/collabora/lov-6.0.5.zip
Use Tango as default icon theme when Breeze is not included distro/collabora/lov-6.0.5
Change-Id: Id81c2355abfbdf29599842f06ad8b3c754db708b (cherry picked from commit d62acf55f17f5b1213f150fb4fb0fd2e8bb0b9b0) Reviewed-on: https://gerrit.libreoffice.org/56418 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--vcl/source/app/IconThemeSelector.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index 2f976d9cb8c0..c7baed973a2b 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 <config_mpl.h>
+
#include <vcl/IconThemeSelector.hxx>
#include <vcl/IconThemeScanner.hxx>
@@ -62,7 +64,11 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
r = "breeze";
}
else if ( desktopEnvironment.equalsIgnoreAsciiCase("MacOSX") ) {
+#if MPL_HAVE_SUBSET
+ r = "tango";
+#else
r = "breeze";
+#endif
}
else if ( desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
r = "breeze";