[Libreoffice-commits] core.git: desktop/source

[Miklos Vajna (via logerrit)]

 desktop/source/lib/init.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 75af93817243dbc24dafc2a4829dfbb4abfe6803
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Dec 4 17:37:17 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Dec 4 19:48:12 2019 +0100

    desktop: fix Android -Werror,-Wunreachable-code
    
    error: code will never be executed [-Werror,-Wunreachable-code]
    
    In the 'old' (JNI-based) Android app case. If clang doesn't like 'if
    (false)', then invert the #if condition so we don't need it.
    
    Change-Id: I79818a51cb284519313738ab4272d109171dfcd0
    Reviewed-on: https://gerrit.libreoffice.org/84431
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 042e4adea546..b527f2cdeb92 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2752,13 +2752,12 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 #else
     ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::DEFAULT);
 
-#if defined(ANDROID) && !HAVE_FEATURE_ANDROID_LOK
+#if !defined(ANDROID) || HAVE_FEATURE_ANDROID_LOK
     // Don't set the transparent background in the 'old' (JNI-based) Android
     // app - no idea why it needs avoiding this.
-    if (false)
-#endif
     // Set background to transparent by default.
     pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+#endif
 
     pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
                 Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),