ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#119128 toggle INSERT/OVERWRITE is broken

Browse Source 
Regression of 632bc11ce8
("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>
This commit is contained in:
Maxim Monastirsky
2018-08-07 15:02:20 +02:00
parent 2fa47f8c0f
commit 92a4e4eac7
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/source/ui/app/inputhdl.cxx
+2 -3
View File
@@ -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)
{