core.git: Branch 'distro/collabora/co-24.04' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/uibase/docvw/edtwin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3843bdcd3c604c88c31bd760f359a3ae434930be
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Nov 6 08:24:26 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Nov 6 09:27:40 2024 +0100

    sw lok: async readonly dialog when pressing delete key on protected content
    
    Open online.git/test/samples/writer.fodt, ctrl-a, del, the read-only
    dialog is blocking.
    
    This was working already for the character insert case, but not when going
    via KEY_DELETE.
    
    Fix the problem similar to what commit
    0c03a97fb8844ad0de1abea79b5265617a509460 (sw edit win: fix read-only
    selections while handling ExtTextInput, 2021-01-13) did, by switching to
    the async path here.
    
    There doesn't seem to be any reason for the old sync behavior, other
    than the safe "keep things unchanged" default in InfoReadOnlyDialog().
    
    Change-Id: I9330cb235bf6c19f96e9d21889eb9639725daf8c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176104
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 347c3e26dcf8..a3cde285a798 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1954,7 +1954,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     }
                     else if (!rSh.IsCursorInParagraphMetadataField())
                     {
-                        rSh.InfoReadOnlyDialog(false);
+                        rSh.InfoReadOnlyDialog(/*bAsync=*/true);
                         eKeyState = SwKeyState::End;
                     }
                     break;