From e77bfe281403e49c58730489e94b62032c296e75 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Mon, 8 Aug 2022 09:27:39 +0200 Subject: android: Add scrollbars.ui into APK That UI file was added in commit 4bc62c4e9b5b4eab6e2e40577789c435dce59f66 Date: Thu Aug 4 15:33:51 2022 +0100 split SwScrollbar up for reuse of adaptor Include it for Android. Without it, trying to load/display any document would result in Android Viewer crashing or getting stuck, with this in the ADB log: 08-08 09:22:20.102 6064 6256 D libo:sal/osl/unx/file: double-slash in path: /assets//config/soffice.cfg/svt/ui/scrollbars.ui 08-08 09:22:20.102 6064 6256 E libo:sal/osl/unx/file: miss cache: failed to open /assets//config/soffice.cfg/svt/ui/scrollbars.ui 08-08 09:22:20.102 6064 6256 W vcl.builder: 23:vcl/source/window/builder.cxx:480: DBG_UNHANDLED_EXCEPTION in VclBuilder 08-08 09:22:20.102 6064 6256 W vcl.builder: when: Unable to read .ui file exception: void 08-08 09:22:20.103 6064 6256 I LOKitTileProvider: ====> mOffice.documentLoad() returned null, trying to restart 'Office' and loading again Change-Id: I0938d77dc9553d8acc7b2bdd4a72b5299b4ec1a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137943 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- android/source/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'android') diff --git a/android/source/build.gradle b/android/source/build.gradle index 13d4d1b0bb14..68e68f8d57ae 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -175,6 +175,7 @@ task copyAssets(type: Copy) { '**/hfmenubutton.ui', '**/inforeadonlydialog.ui', '**/pbmenubutton.ui', + '**/scrollbars.ui', '**/tabbuttons.ui', '**/tabviewbar.ui' } } -- cgit cib/libreoffice-6-4'>distro/cib/libreoffice-6-4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-11-19tdf#123936 Formatting files in module lotuswordpro with clang-formatPhilipp Hofer
2018-03-06ofz: memory leakCaolán McNamara
2017-10-23loplugin:includeform: lotuswordproStephan Bergmann
2017-10-19Make include files found through -Ilotuswordpro/incStephan Bergmann
2017-10-17Move lotuswordpro include files to common include directoryStephan Bergmann