sc/source/ui/app/inputhdl.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit c9f9641c4654e7b867c604a347a568c0a6e97ce8
Author: Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Mon Aug 6 23:50:21 2018 +0300
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Aug 8 20:41:46 2018 +0200
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 <momonas...@gmail.com>
(cherry picked from commit 92a4e4eac7520541a433e40836cafa4e29edf47f)
Reviewed-on: https://gerrit.libreoffice.org/58709
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index adb1c2437cac..b572b9ac06dc 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3414,15 +3414,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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
