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

[Tor Lillqvist]

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

New commits:
commit d62acf55f17f5b1213f150fb4fb0fd2e8bb0b9b0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri May 18 14:16:31 2018 +0300

    Use Tango as default icon theme when Breeze is not included
    
    Change-Id: Id81c2355abfbdf29599842f06ad8b3c754db708b

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";