summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2019-11-18 17:08:00 +0100
committerMichael Meeks <michael.meeks@collabora.com>2020-01-03 12:31:12 +0100
commitd495eb9f78fe72176c756e0c159d2edc04bec522 (patch)
treec54de822e9cbfb645ccc73c7e5a3277751621f42 /android
parent42ccf3f85f0089ab823d46e3593a00a6dc2702e6 (diff)
tdf#128101 android: fix documents with manual page break
code reads a .ui file to show a menu to edit/delete that pagebreak. That file was not packaged in the Android viewer and causes an exception that is not handled and ultimately results in a crash. Change-Id: Ie73d886daf9202ba12e1b5a241bc7b6d184ae770 Reviewed-on: https://gerrit.libreoffice.org/83104 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86165 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'android')
-rw-r--r--android/source/build.gradle7
1 files changed, 7 insertions, 0 deletions
diff --git a/android/source/build.gradle b/android/source/build.gradle
index a5fd073f7aeb..03fe251d6a9b 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -149,6 +149,13 @@ task copyUnpackAssets(type: Copy) {
)
}
}
+ // documents with manual page break trigger attempt to read the ui file
+ // would trigger a css::container::NoSuchElementException with osl_File_E_NOENT
+ // if not present and since it is not caught would crash the app...
+ into('config') {
+ from "${liboInstdir}/share/config"
+ include '**/pagebreakmenu.ui'
+ }
}
task copyAssets(type: Copy) {