From b7056b800f50eaa861177891ef0ee9d103f65069 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Wed, 8 Apr 2020 08:29:01 +0200 Subject: tdf#116243 android: Include headerfootermenu.ui Otherwise, Android Viewer crashes when clicking inside a header or footer, failing to access the file: E libo:sal/osl/unx/file: failed to open /assets//config/soffice.cfg/modules/swriter/ui/headerfootermenu.ui W vcl.builder: 2:vcl/source/window/builder.cxx:481: DBG_UNHANDLED_EXCEPTION in VclBuilder::VclBuilder(vcl::Window *, const rtl::OUString &, const rtl::OUString &, const rtl::OString &, const css::uno::Reference &, bool, const NotebookBarAddonsItem *) W vcl.builder: when: Unable to read .ui file exception: com.sun.star.container.NoSuchElementException message: file:///assets//config/soffice.cfg/modules/swriter/ui/headerfootermenu.ui I stderr : terminating with uncaught exception of type com::sun::star::container::NoSuchElementException Change-Id: Iaf95e3dd2dbd9c471c8e1b3facabe21c93c47622 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91865 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- android/source/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'android') diff --git a/android/source/build.gradle b/android/source/build.gradle index 3383df0679d6..a672d0945c73 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -190,10 +190,11 @@ task copyAssets(type: Copy) { // documents with manual page break trigger attempt to read the ui file 'pagebreakmenu.ui' // would trigger a css::container::NoSuchElementException with osl_File_E_NOENT // if not present and since it is not caught would crash the app; - // 'annotationmenu.ui' required to handle documents containing comments + // 'annotationmenu.ui' required to handle documents containing comments, + // 'headerfootermenu.ui' when clicking inside header/footer of document into('config') { from "${liboInstdir}/share/config" - include '**/pagebreakmenu.ui', '**/annotationmenu.ui' + include '**/pagebreakmenu.ui', '**/annotationmenu.ui', '**/headerfootermenu.ui' } } -- cgit