From 92a4e4eac7520541a433e40836cafa4e29edf47f Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Mon, 6 Aug 2018 23:50:21 +0300 Subject: 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 --- sc/source/ui/app/inputhdl.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sc') diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 8b1e5b9fd413..2a544ab4151b 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3412,15 +3412,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) { -- cgit