summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2020-03-06 11:01:49 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2020-03-06 16:47:30 +0100
commit9989f7870cfb82722cf2fd6b9cfdf7aea77c0011 (patch)
tree1da7d6f02a751e3c250b82136ccd7c4d6a779418 /android
parentandroid: Hide cursor again when selection was done due to search (diff)
downloadcore-9989f7870cfb82722cf2fd6b9cfdf7aea77c0011.tar.gz
core-9989f7870cfb82722cf2fd6b9cfdf7aea77c0011.zip
tdf#131179 android: Support docs containing comments
UI file 'annotationmenu.ui' is needed to make documents with comments work, rather than crashing Android Viewer. This not just fixes the crash, but actually makes the comments show up. Change-Id: I68abc21f6d442549a8a8304d861e1c3223644fbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90094 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'android')
-rw-r--r--android/source/build.gradle7
1 files changed, 4 insertions, 3 deletions
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 09af74063fd0..6cd5d4ff0917 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -181,12 +181,13 @@ task copyAssets(type: Copy) {
include '*.data'
}
}
- // documents with manual page break trigger attempt to read the ui file
+ // 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...
+ // if not present and since it is not caught would crash the app;
+ // 'annotationmenu.ui' required to handle documents containing comments
into('config') {
from "${liboInstdir}/share/config"
- include '**/pagebreakmenu.ui'
+ include '**/pagebreakmenu.ui', '**/annotationmenu.ui'
}
}