Kaydet (Commit) 1c4fc136 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#704245 Logically dead code

since

commit 7599f68c
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date:   Wed Apr 22 11:01:27 2009 +0000
    CWS-TOOLING: integrate CWS dba32a

Change-Id: I85c45344ca31d50bd99c12b8c9dc29478aadb067
üst 13f26219
...@@ -672,34 +672,21 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) ...@@ -672,34 +672,21 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
if (eHit == SDRHIT_UNMARKEDOBJECT && if (eHit == SDRHIT_UNMARKEDOBJECT && nId != OBJ_CUSTOMSHAPE)
nId != OBJ_CUSTOMSHAPE)
{ {
// there is an object under the mouse cursor, but not a customshape // there is an object under the mouse cursor, but not a customshape
m_pParent->getSectionWindow()->getViewsWindow()->BrkAction(); m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
return false; 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 deactivateOle(true);
if ( !m_pParent->getSectionWindow()->getViewsWindow()->IsAction() ) if ( m_pParent->getSectionWindow()->getViewsWindow()->HasSelection() )
{ m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(&m_rView);
deactivateOle(true); m_rView.BegCreateObj(m_aMDPos);
if ( m_pParent->getSectionWindow()->getViewsWindow()->HasSelection() ) m_pParent->getSectionWindow()->getViewsWindow()->createDefault();
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 );
} }
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment