diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-30 13:19:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-30 14:34:29 +0000 |
| commit | 1c4fc13600e0466dc6d1816d3a0306db6566141a (patch) | |
| tree | abbf905391a4c37791ceb6951812982a0c131959 /reportdesign | |
| parent | 13f26219a44ef158f26c543ff926e57e5831b477 (diff) | |
coverity#704245 Logically dead code
since
commit 7599f68cee9141cd16ca7697872b5f83c6ae9ad9
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Apr 22 11:01:27 2009 +0000
CWS-TOOLING: integrate CWS dba32a
Change-Id: I85c45344ca31d50bd99c12b8c9dc29478aadb067
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/dlgedfunc.cxx | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 07067619fff9..db21172658c0 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -672,34 +672,21 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); - if (eHit == SDRHIT_UNMARKEDOBJECT && - nId != OBJ_CUSTOMSHAPE) + if (eHit == SDRHIT_UNMARKEDOBJECT && nId != OBJ_CUSTOMSHAPE) { // there is an object under the mouse cursor, but not a customshape m_pParent->getSectionWindow()->getViewsWindow()->BrkAction(); return false; } - if( eHit != SDRHIT_UNMARKEDOBJECT || nId == OBJ_CUSTOMSHAPE) + // if no action, create object + if (!m_pParent->getSectionWindow()->getViewsWindow()->IsAction()) { - // if no action, create object - if ( !m_pParent->getSectionWindow()->getViewsWindow()->IsAction() ) - { - deactivateOle(true); - if ( m_pParent->getSectionWindow()->getViewsWindow()->HasSelection() ) - m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(&m_rView); - m_rView.BegCreateObj(m_aMDPos); - m_pParent->getSectionWindow()->getViewsWindow()->createDefault(); - } - } - else - { - if( !rMEvt.IsShift() ) - { - // shift key pressed? - m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); - } - m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos,&m_rView ); + deactivateOle(true); + if ( m_pParent->getSectionWindow()->getViewsWindow()->HasSelection() ) + m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(&m_rView); + m_rView.BegCreateObj(m_aMDPos); + m_pParent->getSectionWindow()->getViewsWindow()->createDefault(); } return true; |