desktop/source/lib/init.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 227ab55b1a1d6fb50fd1c41ba4f7d42518b4994c
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Mon Dec 2 12:01:05 2019 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Dec 4 14:12:29 2019 +0100
lok: Fix the condition of setting the transparent background.
Change-Id: I7b201296efe6541761896e0af1b230aecb534cdc
Reviewed-on: https://gerrit.libreoffice.org/84211
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 679c4f95b471..042e4adea546 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2752,12 +2752,13 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
#else
ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::DEFAULT);
-#if 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.
- // [Unless it is the 'old' (JNI-based) Android app - no idea why it
- // needs avoiding this.]
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
-#endif
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
