summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-12-02 12:01:05 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-12-04 14:12:29 +0100
commit227ab55b1a1d6fb50fd1c41ba4f7d42518b4994c (patch)
tree9da6c9ef2ec50dcd0f257d792f4417554b366da8 /desktop
parentef5133e468e70966ef7499a7f1c70ffbfd89f641 (diff)
lok: Fix the condition of setting the transparent background.
Change-Id: I7b201296efe6541761896e0af1b230aecb534cdc Reviewed-on: https://gerrit.libreoffice.org/84211 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx9
1 files changed, 5 insertions, 4 deletions
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(),