summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Trojahn <paul.trojahn@gmail.com>2018-07-09 20:36:09 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-07-26 17:57:02 +0200
commit65eaebd2879c18926d4672c9276ef7f73f87af99 (patch)
tree15928dcfdb61e7bd1fe0403afe89cd21772c73ee
parente2a5932da7a3df9f6440f8326520061caa2342c1 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--editeng/source/editeng/impedit2.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index f3c9930ed9e8..bd641ce70b7b 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -624,7 +624,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;
}