[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

[Tamás Zolnai (via logerrit)]

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

New commits:
commit 5bb263f945abda08dc1a54748e9ca70c81cff7cc
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Jan 13 05:30:53 2021 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Jan 21 12:26:48 2021 +0100

    lok: don't turn off online spelling by view change.
    
    Since we don't exit editing for LOK inside this NotifyChange()
    method, we should keep also spelling functionality alive. See
    also the comment we have here: "As long as the content is not
    edited, turn off online spelling." So it seems a good idea
    to make this spelling modification dependent of bStopEditing flag.
    This causes issues, during view switches.
    
    Change-Id: Ic684073d129c1cac4b6f4d11f34cd64cb5db3295
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109206
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 6554d69871b0798ae38e5a406aefb5dd90f19ff0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109625

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d182d3ae828b..48faf207b89e 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -4051,16 +4051,17 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
                         pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS, aPosStr.toUtf8().getStr());
                 }
 
-                if (bStopEditing)
+                if (bStopEditing) {
                     SfxGetpApp()->Broadcast( SfxHint( SfxHintId::ScKillEditView ) );
 
-                //  As long as the content is not edited, turn off online spelling.
-                //  Online spelling is turned back on in StartTable, after setting
-                //  the right language from cell attributes.
+                    //  As long as the content is not edited, turn off online spelling.
+                    //  Online spelling is turned back on in StartTable, after setting
+                    //  the right language from cell attributes.
 
-                EEControlBits nCntrl = mpEditEngine->GetControlWord();
-                if ( nCntrl & EEControlBits::ONLINESPELLING )
-                    mpEditEngine->SetControlWord( nCntrl & ~EEControlBits::ONLINESPELLING );
+                    EEControlBits nCntrl = mpEditEngine->GetControlWord();
+                    if ( nCntrl & EEControlBits::ONLINESPELLING )
+                        mpEditEngine->SetControlWord( nCntrl & ~EEControlBits::ONLINESPELLING );
+                }
 
                 bModified = false;
                 bSelIsRef = false;