sw/source/uibase/docvw/edtwin.cxx | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 8a764bc0df140f72a5d552db6cb6623d02d5c11f
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Sun Oct 21 22:55:53 2018 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Oct 22 10:03:37 2018 +0200
tdf#120703 (PVS): Recurring check.
V571 The 'SwKeyState::KeyToView != eFlyState' condition was already
verified in line 1723.
Change-Id: I4fb5d7a5e50822985ca753706d4cdb1693439118
Reviewed-on: https://gerrit.libreoffice.org/62161
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 9bc9fe208798..f9bb7443c3b7 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1718,13 +1718,10 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
KEYINPUT_CHECKTABLE:
if( rSh.IsTableMode() || !rSh.GetTableFormat() )
{
- if(SwKeyState::KeyToView != eFlyState)
- {
- if(!pFlyFormat && SwKeyState::KeyToView !=
eFlyState &&
- (rSh.GetSelectionType() &
(SelectionType::DrawObject|SelectionType::DbForm)) &&
- rSh.GetDrawView()->AreObjectsMarked())
- eKeyState = SwKeyState::Draw_Change;
- }
+ if(!pFlyFormat && SwKeyState::KeyToView != eFlyState &&
+ (rSh.GetSelectionType() &
(SelectionType::DrawObject|SelectionType::DbForm)) &&
+ rSh.GetDrawView()->AreObjectsMarked())
+ eKeyState = SwKeyState::Draw_Change;
if( pFlyFormat )
eKeyState = eFlyState;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
