diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-11-20 17:55:43 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-12-02 11:13:54 +0100 |
| commit | 668b03284c4b0df56d5a000cc38dd1144ec33bbe (patch) | |
| tree | d48b57fbcb6a28458c1d993bad95091a7fb7bde3 /desktop/source | |
| parent | b648e36c775e8707e7f6a49b264951916cf4092d (diff) | |
android: Get rid of the 'old' vs. Online-based runtime distinction.
No need for this when we have a compile-time distinction now anyway.
Change-Id: Ic86c8cce38a86635ea3efb4229c08f63059c9ee6
Reviewed-on: https://gerrit.libreoffice.org/83719
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/lib/init.cxx | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 8f05cc487672..7fb08f0bec15 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_features.h> #include <config_folders.h> #include <stdio.h> @@ -2712,13 +2713,6 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis, } } -#if defined(ANDROID) -/// For the distinction if the LOK is used for the 'old' (JNI-based) or the -/// 'new' (loolwsd-based) app. Default to the 'new', ie. not used from JNI as -/// implemented in sal/android/libreofficekit-jni.c. -bool android_lok_from_jni = false; -#endif - static void doc_paintTile(LibreOfficeKitDocument* pThis, unsigned char* pBuffer, const int nCanvasWidth, const int nCanvasHeight, @@ -2756,15 +2750,12 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis, #else ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::DEFAULT); -#if defined(ANDROID) - if (!android_lok_from_jni) +#if HAVE_FEATURE_ANDROID_LOK + // 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 - { - // 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)); - } pDevice->SetOutputSizePixelScaleOffsetAndBuffer( Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), |