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

Caolán McNamara caolanm at redhat.com
Fri Feb 5 15:33:42 UTC 2016


 editeng/source/editeng/impedit.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 1b0fa861e469c018d77f8c61c95bdaeffc1b01a1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 2 14:51:02 2016 +0000

    Related: tdf#97375 a cut doesn't refresh the editview
    
    but a delete does. The diff from delete to cut is the
    EnterBlockNotifications/LeaveBlockNotifications calls so try that
    
    Change-Id: I10147043d6fe358bf2f4f4bd6877210b86cbbd1f
    (cherry picked from commit c3224db8baa443253584954d1d54651c9d863304)
    Reviewed-on: https://gerrit.libreoffice.org/22048
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 453bcbe..8475a6a 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1397,12 +1397,13 @@ void ImpEditView::CutCopy( css::uno::Reference< css::datatransfer::clipboard::XC
 
         }
 
-        if ( bCut )
+        if (bCut)
         {
-            pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_CUT );
+            pEditEngine->pImpEditEngine->EnterBlockNotifications();
+            pEditEngine->pImpEditEngine->UndoActionStart(EDITUNDO_CUT);
             DeleteSelected();
-            pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_CUT );
-
+            pEditEngine->pImpEditEngine->UndoActionEnd(EDITUNDO_CUT);
+            pEditEngine->pImpEditEngine->LeaveBlockNotifications();
         }
     }
 }


More information about the Libreoffice-commits mailing list