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

[Caolán McNamara]

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

New commits:
commit bf81970071261e99c5921ae1b8748fde82b8e077
Author: Caolán McNamara <caolanm at 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/23087
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index d410201..04daad9 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -892,11 +892,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;
         }