diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2018-08-06 23:50:21 +0300 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-08-17 19:41:10 +0200 |
| commit | 319db92f96c9b886cecee97136175e12e94da547 (patch) | |
| tree | ce6c4d9d6e01fe74f1ec9f3104eeebe2d51083ed | |
| parent | fb63a622cb843d2d0178bc26ff35d9b17deaee5a (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>
| -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 90c1fbc59437..f7bfb702896b 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3397,15 +3397,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 ) ) |