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

coverity#735862 Unchecked dynamic_cast

Change-Id: Id23987edcff82621cbe932b4273fec0371bd481b
üst 093c4ee9
......@@ -780,7 +780,6 @@ void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, F
Broadcast( aInsertedHint );
}
void FmFilterModel::Remove(FmFilterData* pData)
{
FmParentData* pParent = pData->GetParent();
......@@ -824,27 +823,26 @@ void FmFilterModel::Remove(FmFilterData* pData)
}
else // FormItems can not be deleted
{
FmFilterItem* pFilterItem = dynamic_cast<FmFilterItem*>( pData );
FmFilterItem& rFilterItem = dynamic_cast<FmFilterItem&>(*pData);
// if its the last condition remove the parent
if (rItems.size() == 1)
Remove(pFilterItem->GetParent());
Remove(rFilterItem.GetParent());
else
{
// find the position of the father within his father
::std::vector<FmFilterData*>& rParentParentItems = pData->GetParent()->GetParent()->GetChildren();
::std::vector<FmFilterData*>::iterator j = ::std::find(rParentParentItems.begin(), rParentParentItems.end(), pFilterItem->GetParent());
::std::vector<FmFilterData*>::iterator j = ::std::find(rParentParentItems.begin(), rParentParentItems.end(), rFilterItem.GetParent());
DBG_ASSERT(j != rParentParentItems.end(), "FmFilterModel::Remove(): unknown Item");
sal_Int32 nParentPos = j - rParentParentItems.begin();
// EmptyText removes the filter
FmFilterAdapter::setText(nParentPos, pFilterItem, OUString());
FmFilterAdapter::setText(nParentPos, &rFilterItem, OUString());
Remove( i );
}
}
}
void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos )
{
// remove from parent's child list
......
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