diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2018-08-06 23:50:21 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-21 10:53:46 +0200 |
| commit | 589133a43f199d9638cd3cb3a24d3557a407134e (patch) | |
| tree | 9425aa3004a2146f3069613a22150f4d15c40f2f /sc | |
| parent | 446b659868a3ef4fd6bc8bcddf8df9aa5ce40b6c (diff) | |
tdf#119128 toggle INSERT/OVERWRITE is broken
Regression of 632bc11ce8fab1c4046ab24810b90a7ce9ac5914
("tdf#117017 Pasting into the formula bar shouldn't
retain formatting"). Toggling the overwrite mode sets
the EVControlBits::OVERWRITE bit from inside the editeng
keyboard handler, so make sure to not override it.
Change-Id: I2b5e3fe9cb885ed20e7528fdfe2fd59f5ef05f42
Reviewed-on: https://gerrit.libreoffice.org/58658
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 92a4e4eac7520541a433e40836cafa4e29edf47f)
Reviewed-on: https://gerrit.libreoffice.org/58718
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 319db92f96c9b886cecee97136175e12e94da547)
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 435d22b8595e..2077b42d2433 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3411,15 +3411,14 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false { if (pTableView) { - EVControlBits nControl = pTableView->GetControlWord(); if (pTopView) - pTableView->SetControlWord(nControl | EVControlBits::SINGLELINEPASTE); + pTableView->SetControlWord(pTableView->GetControlWord() | EVControlBits::SINGLELINEPASTE); vcl::Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : nullptr; if ( pTableView->PostKeyEvent( rKEvt, pFrameWin ) ) bUsed = true; - pTableView->SetControlWord(nControl); + pTableView->SetControlWord(pTableView->GetControlWord() & ~EVControlBits::SINGLELINEPASTE); } if (pTopView) if ( pTopView->PostKeyEvent( rKEvt ) ) |