[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source

[Libreoffice Gerrit user]

 editeng/source/editeng/impedit2.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 19d6d196c9bc70f7a5938c89830b57dbdcfb8801
Author:     Paul Trojahn <paul.trojahn at gmail.com>
AuthorDate: Mon Jul 9 20:36:09 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jul 28 16:48:02 2018 +0200

    tdf#115438 Fix freeze when pasting unformatted text
    
    ImpConnectParagraphs calls TextModified, which calculates the selection rectangles of
    the paragraph for accessibility services by calling DrawSelectionXOR. When
    calling ImpConnectParagraphs from ImpDeleteSelection, the selection isn't
    valid, because UpdateSelection wasn't called yet. DrawSelectionXOR ends up
    freezing the application, because pEndNode isn't valid.
    
    This can be fixed by calling EnterBlockNotifications, to deliver the notification
    sent by TextModified when the insertion is done.
    
    Change-Id: Ia3a0e5b59a28f3503cbc54da682fcdaa5af277be
    Reviewed-on: https://gerrit.libreoffice.org/57286
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 65eaebd2879c18926d4672c9276ef7f73f87af99)
    Reviewed-on: https://gerrit.libreoffice.org/58136
    Tested-by: Jenkins
    Reviewed-by: Paul Trojahn <paul.trojahn at gmail.com>

diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 4c2c0c73a3e4..4bd83aa6e644 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -614,7 +614,9 @@ bool ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
 
 EditPaM ImpEditEngine::InsertText(const EditSelection& aSel, const OUString& rStr)
 {
+    EnterBlockNotifications();
     EditPaM aPaM = ImpInsertText( aSel, rStr );
+    LeaveBlockNotifications();
     return aPaM;
 }