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

[Jan Holesovsky (via logerrit)]

 vcl/source/image/ImplImageTree.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 7b9ec19bc2447389d7648401aa40ff8797e0c6af
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Jun 18 10:43:16 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jun 18 12:39:41 2019 +0200

    [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 <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

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,