summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2021-05-17 14:31:51 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2021-05-19 07:42:37 +0200
commite96f72184ecdb589bbed6b3b30c7be3bfd726edc (patch)
tree00b02d0ede306ae96e8a62ddaf7d11be5084043c /desktop
parent92511657969ff93abd31a1368082d3c4dc42d479 (diff)
tdf#142348 Use transparent background for Android Viewer, too
After commit e0094d6fe58eaa9a79b546149cf67db521cd1230 Date: Mon Apr 26 10:43:11 2021 +0900 lok: add rendering and input for form controls in Calc instead of properly rendering Calc documents, Android Viewer was only showing a blank area instead of the actual doc content. (In case of a Calc doc containing form controls, they were visible on top of an otherwise white background.) Using a transparent background by default in Android Viewer as well, just as is done for all other scenarios already, makes this work as expected again (except for another issue introduced with commit 1bc42472200c32c9a0a10dd1c3cd6c6a8a5d47d2 Date: Fri Apr 9 13:59:43 2021 +0200 tdf#95517 android: Rework app/doc lifecycle handling that will be handled in a separate commit). The comment already mentioned that it was unclear why that should not work for Android Viewer and I did not see any apparent problem when testing a bit, so just drop the special handling for Android Viewer here. Change-Id: I3005c5517ce1198af99b27af541fe59eaa896da2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115749 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2ca561285d93..8df015866484 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3176,12 +3176,8 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
#else
ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::DEFAULT);
-#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.
// Set background to transparent by default.
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
-#endif
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),