diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-24 21:55:10 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-25 09:13:12 +0100 |
| commit | f2cd9c0c789b5825b4d5bb84b352d089e231e527 (patch) | |
| tree | 95f6ecfaf25231ee4de3320995263780cd655792 /sw/source/uibase | |
| parent | e1cbd518118a5f2889213e5725e0e0a3c133de5d (diff) | |
tdf#120703 PVS: V560 A part of conditional expression is always true/false
Change-Id: If173f42302553b164267909a0a3156bb25a6d558
Reviewed-on: https://gerrit.libreoffice.org/63957
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/fldui/fldmgr.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 23ceeca5a22b..1dcf34f2d88e 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -1284,7 +1284,7 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir ) else { // move handle with index nHandleIndex - if(pHdl && (nX || nY)) + if (nX || nY) { if( SdrHdlKind::Anchor == pHdl->GetKind() || SdrHdlKind::Anchor_TR == pHdl->GetKind() ) @@ -3114,8 +3114,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // only try to select frame, if pointer already was // switched accordingly if ( m_aActHitType != SdrHitKind::NONE && !rSh.IsSelFrameMode() && - !GetView().GetViewFrame()->GetDispatcher()->IsLocked() && - !bExecDrawTextLink) + !GetView().GetViewFrame()->GetDispatcher()->IsLocked()) { // Test if there is a draw object at that position and if it should be selected. bool bShould = rSh.ShouldObjectBeSelected(aDocPos); diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 52c8a12bd17e..5ada2a617ae4 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -883,7 +883,7 @@ bool SwFieldMgr::GoNextPrev( bool bNext, SwFieldType* pTyp ) return pSh->MoveFieldType( nullptr, bNext, SwFieldIds::Database ); } - return pTyp && pSh && pSh->MoveFieldType( pTyp, bNext ); + return pTyp && pSh->MoveFieldType(pTyp, bNext); } // insert field types |