[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - basctl/source

[Caolán McNamara]

 basctl/source/basicide/baside2.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 5c81d2d556a4e3b24440b4f917e0d0b720a0d719
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Mar 9 15:30:51 2016 +0000

    Resolves: tdf#95428 backspace in readonly macro editor hangs
    
    Change-Id: I16568b00e92d18f32818188ba3ab8df92bbd13aa
    (cherry picked from commit 5b3f84cec471ddbde98a46220096cdb952bb1935)
    Reviewed-on: https://gerrit.libreoffice.org/23088
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Eike Rathke <er...@redhat.com>

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index d602a74..891c7f6 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -894,11 +894,10 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
     {
         case SID_DELETE:
         {
-            KeyEvent aFakeDelete( 0, KEY_DELETE );
-            bool bDone = GetEditView()->KeyInput( aFakeDelete );
-            if (!bDone)
+            if (!IsReadOnly())
             {
-                BaseWindow::KeyInput(aFakeDelete);
+                KeyEvent aFakeDelete(0, KEY_DELETE);
+                (void)GetEditView()->KeyInput(aFakeDelete);
             }
             break;
         }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits