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

Michael Weghorn (via logerrit) logerrit at kemper.freedesktop.org
Mon Mar 22 06:59:15 UTC 2021


 android/source/build.gradle |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1bf8f4569502b7900c51f2e238acda6567c96281
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri Mar 19 17:20:45 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Mar 22 07:58:33 2021 +0100

    tdf#141111 android: Don't crash trying to edit read-only section
    
    Trying to type in a read-only Writer section in Android Viewer
    led to a crash due to
    '/assets//config/soffice.cfg/modules/swriter/ui/inforeadonlydialog.ui'
    not being present.
    
    Include the .ui file to avoid this. (Trying to type now
    doesn't do anything, no warning about this being
    read-only is shown.)
    
    Change-Id: I616d41c312187fa7855430715a47e80477ef2188
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112771
    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 10ed31b3f341..f6f781b0e407 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -185,7 +185,10 @@ task copyAssets(type: Copy) {
     // include required .ui files
     into('config') {
         from "${liboInstdir}/share/config"
-        include '**/annotation.ui', '**/hfmenubutton.ui', '**/pbmenubutton.ui',
+        include '**/annotation.ui',
+                '**/hfmenubutton.ui',
+                '**/inforeadonlydialog.ui',
+                '**/pbmenubutton.ui',
                 '**/tabbuttons.ui', '**/tabviewbar.ui'
     }
 }


More information about the Libreoffice-commits mailing list