mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#1242824 Unused value

Browse Source 
Change-Id: I5f53e538f8f76c337cda8b90fcf4ed717ed2476e
This commit is contained in:
Caolán McNamara
2014-11-17 16:39:03 +00:00
parent b1bd96e702
commit 5d0da4db5a
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
chart2/source/controller/main/SelectionHelper.cxx
View File

@@ -172,13 +172,12 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
//bAllowMultiClickSelectionChange==true -> a second click on the same object can lead to a changed selection (e.g. series -> single data point) //bAllowMultiClickSelectionChange==true -> a second click on the same object can lead to a changed selection (e.g. series -> single data point)
//get object to select: //get object to select:
SdrObject* pNewObj = 0;
{ {
m_aSelectedOID_selectOnlyIfNoDoubleClickIsFollowing = ObjectIdentifier(); m_aSelectedOID_selectOnlyIfNoDoubleClickIsFollowing = ObjectIdentifier();
//the search for the object to select starts with the hit object deepest in the grouping hierarchy (a leaf in the tree) //the search for the object to select starts with the hit object deepest in the grouping hierarchy (a leaf in the tree)
//further we travel along the grouping hierarchy from child to parent //further we travel along the grouping hierarchy from child to parent
pNewObj = pDrawViewWrapper->getHitObject(rMousePos); SdrObject* pNewObj = pDrawViewWrapper->getHitObject(rMousePos);
m_aSelectedOID = ObjectIdentifier( lcl_getObjectName( pNewObj ) );//name of pNewObj m_aSelectedOID = ObjectIdentifier( lcl_getObjectName( pNewObj ) );//name of pNewObj
//ignore handle only objects for hit test //ignore handle only objects for hit test
@@ -207,7 +206,6 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
//if a sibling of the last selected object is clicked don't go up further //if a sibling of the last selected object is clicked don't go up further
break; break;
} }
SdrObject* pLastChild = pNewObj;
ObjectIdentifier aLastChild = m_aSelectedOID; ObjectIdentifier aLastChild = m_aSelectedOID;
if ( !SelectionHelper::findNamedParent( pNewObj, m_aSelectedOID, false ) ) if ( !SelectionHelper::findNamedParent( pNewObj, m_aSelectedOID, false ) )
{ {
@@ -220,17 +218,15 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
{ {
if( bAllowMultiClickSelectionChange ) if( bAllowMultiClickSelectionChange )
{ {
pNewObj = pLastChild;
m_aSelectedOID = aLastChild; m_aSelectedOID = aLastChild;
} }
else else
m_aSelectedOID_selectOnlyIfNoDoubleClickIsFollowing = aLastChild; m_aSelectedOID_selectOnlyIfNoDoubleClickIsFollowing = aLastChild;
break; break;
} }
} }
OSL_ENSURE( pNewObj && m_aSelectedOID.isValid(), "somehow lost selected object" ); OSL_ENSURE(m_aSelectedOID.isValid(), "somehow lost selected object");
} }
else else
{ {
@@ -281,7 +277,6 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
if( pDrawViewWrapper->IsObjectHit( pLegend, rMousePos ) ) if( pDrawViewWrapper->IsObjectHit( pLegend, rMousePos ) )
{ {
m_aSelectedOID = ObjectIdentifier( aLegendCID ); m_aSelectedOID = ObjectIdentifier( aLegendCID );
pNewObj = pLegend;
} }
} }
} }