desktop/source/lib/init.cxx | 21 ++++++---------------
sal/android/libreofficekit-jni.c | 5 -----
2 files changed, 6 insertions(+), 20 deletions(-)
New commits:
commit fa6979f1f5e781aa8d141a7a6691e2de55937c39
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Wed Nov 20 17:55:43 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Mon Dec 2 10:23:25 2019 +0100
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/83343
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index afbd4d283b35..ec13f24fae3b 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>
@@ -2711,13 +2712,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,
@@ -2755,15 +2749,12 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
#else
ScopedVclPtrInstance< VirtualDevice > pDevice(nullptr, Size(1, 1),
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(),
diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c
index 93742833168b..b853d8e75380 100644
--- a/sal/android/libreofficekit-jni.c
+++ b/sal/android/libreofficekit-jni.c
@@ -37,7 +37,6 @@ extern const char* data_dir;
extern const char* cache_dir;
extern void* apk_file;
extern int apk_file_size;
-extern bool android_lok_from_jni; ///< for the distinction if the LOK is used
for the 'old' (JNI-based) or the 'new' (loolwsd-based) app
AAssetManager* native_asset_manager;
extern void Java_org_libreoffice_android_Bootstrap_putenv(JNIEnv* env, jobject
clazz, jstring string);
@@ -163,10 +162,6 @@ jboolean
Java_org_libreoffice_kit_LibreOfficeKit_initializeNative
(void) clazz;
- // the 'old' app needs to avoid setting the virtual device to transparent
- // in paintTile(), so indicate we are using the 'old' app
- android_lok_from_jni = true;
-
libreofficekit_initialize(env, dataDir, cacheDir, apkFile, assetManager);
// LibreOfficeKit expects a path to the program/ directory
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
