[Libreoffice-commits] core.git: android/source

[Michael Weghorn (via logerrit)]

 android/source/build.gradle |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9989f7870cfb82722cf2fd6b9cfdf7aea77c0011
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri Mar 6 11:01:49 2020 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Mar 6 16:47:30 2020 +0100

    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 at posteo.de>

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'
     }
 }