core.git: Branch 'distro/collabora/co-23.05' - 2 commits - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 393a4bee9492f3d95922a6c89f776730d3135d42
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jan 11 08:46:07 2024 +0000
Commit:     Skyler Grey <skyler.g...@collabora.com>
CommitDate: Fri Jan 12 14:56:19 2024 +0100

    cid#1583748 Dereference after null check
    
    Change-Id: I147e0454e215b3a26e97c0a6d727db25fd2549a0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161864
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Skyler Grey <skyler.g...@collabora.com>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 9ab8a7cde4e5..18d6bb98b792 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3867,8 +3867,10 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, 
bool bStartEdit /* = false
 
                 ScModule* pScMod = SC_MOD();
                 const ScInputOptions& rOpt = pScMod->GetInputOptions();
-                if ( (rOpt.GetMoveKeepEdit() && 
!comphelper::LibreOfficeKit::isActive())
-                    || (pActiveViewSh->GetMoveKeepEdit() && 
comphelper::LibreOfficeKit::isActive()) )
+                const bool bKit = comphelper::LibreOfficeKit::isActive();
+
+                if ( (rOpt.GetMoveKeepEdit() && !bKit)
+                    || (pActiveViewSh && pActiveViewSh->GetMoveKeepEdit() && 
bKit) )
                     pScMod->SetInputMode( SC_INPUT_TABLE );
 
                 bUsed = true;
commit 7434a301ccdab3ceb966842209ff62766c492513
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Jan 10 08:45:18 2024 +0000
Commit:     Skyler Grey <skyler.g...@collabora.com>
CommitDate: Fri Jan 12 14:56:14 2024 +0100

    cid#1583748 Dereference after null check
    
    since:
    
    commit 20502992b862e5a83140b6d2b19722cdc652eeab
    Date:   Mon Dec 4 14:08:09 2023 +0000
    
        calc: Add option to keep edit mode on enter/tab
    
    Change-Id: Ic338602945fb77cebf771fe3d0ad2e4e94fc0318
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161874
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit e80842b37ed8b3e76dce68719ac0dfbeaefd567c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161853
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Skyler Grey <skyler.g...@collabora.com>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 0f7a2afc858f..9ab8a7cde4e5 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3819,9 +3819,10 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, 
bool bStartEdit /* = false
 
         ScModule* pScMod = SC_MOD();
         const ScInputOptions& rOpt = pScMod->GetInputOptions();
+        const bool bKit = comphelper::LibreOfficeKit::isActive();
 
-        if ( (rOpt.GetMoveKeepEdit() && 
!comphelper::LibreOfficeKit::isActive())
-             || (pActiveViewSh->GetMoveKeepEdit() && 
comphelper::LibreOfficeKit::isActive()) )
+        if ( (rOpt.GetMoveKeepEdit() && !bKit)
+             || (pActiveViewSh && pActiveViewSh->GetMoveKeepEdit() && bKit) )
             pScMod->SetInputMode( SC_INPUT_TABLE );
 
         return true;