[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sd/source

[Samuel Mehrbrodt (via logerrit)]

 sd/source/ui/view/drviews4.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9d34b51efba7704beacc06cc93aa0bf6cf51a103
Author:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Mon Nov 7 13:43:48 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Nov 9 10:45:56 2022 +0100

    tdf#144399 Don't allow editing in r/o mode
    
    Fallout from ea9fff260129ccfa4755e96c08432252efbe5621
    
    Change-Id: I0c73d13b79389db13bb04046731bdf18b4cf6005
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142382
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    (cherry picked from commit 429f3d8e3eddedb7ab183b6530220bc7491302e7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142308
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Jenkins

diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index b07279844265..df251880d6fd 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -254,11 +254,12 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, 
::sd::Window* pWin)
                FreshNavigatrTree();
             }
         }
+        if (!bRet && !mbReadOnly) // tdf#139804
+        {
+            bRet = GetView()->KeyInput(rKEvt, pWin);
+        }
     }
 
-    if (!bRet)
-        bRet = GetView()->KeyInput(rKEvt, pWin);
-
     return bRet;
 }