From 7b9ec19bc2447389d7648401aa40ff8797e0c6af Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 18 Jun 2019 10:43:16 +0200 Subject: [cp] android: Default to colibre. Not ideal to use an ifdef, but I don't want to affect anything other than Android; and there is no need to up-stream this either, colibre is the default in master already. Change-Id: I3b1a29b69cfda89c8615586a5afc78fd1eca8c3e Reviewed-on: https://gerrit.libreoffice.org/74266 Reviewed-by: Andras Timar Tested-by: Andras Timar --- vcl/source/image/ImplImageTree.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 1a41d175a0b1..65a9b5562114 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -258,6 +258,12 @@ OUString ImplImageTree::fallbackStyle(const OUString& rsStyle) { OUString sResult; +#ifdef ANDROID + if (rsStyle == "colibre") + return ""; + else + return "colibre"; +#else if (rsStyle == "galaxy") sResult = ""; else if (rsStyle == "industrial" || rsStyle == "tango" || rsStyle == "breeze") @@ -272,6 +278,7 @@ OUString ImplImageTree::fallbackStyle(const OUString& rsStyle) sResult = "tango"; return sResult; +#endif } bool ImplImageTree::loadImage(OUString const & rName, OUString const & rStyle, BitmapEx & rBitmap, bool localized, -- cgit v1.2.3