summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2019-11-18 17:08:00 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2019-11-19 18:16:18 +0100
commit93ee955c5359e283e2fe88e45b4c02a60525ed11 (patch)
tree05ffd143958417e136381cf1f79b21119d7ccaa3 /android
parenttdf#128608 ww8import: COL_AUTO == NO FILL, not solid (diff)
downloadcore-93ee955c5359e283e2fe88e45b4c02a60525ed11.tar.gz
core-93ee955c5359e283e2fe88e45b4c02a60525ed11.zip
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>
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 5bf49406648e..5ca9a02a4973 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) {