diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-14 10:13:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-14 10:59:49 +0100 |
| commit | d9b9b6f74cf8ad7ce617521b479e836997479102 (patch) | |
| tree | 4f71e1ce3c1dc407893036db624ee74d14d0b632 /svx | |
| parent | 093c4ee9de478ca2273c1fa6eda1f7a62b823b0a (diff) | |
coverity#735862 Unchecked dynamic_cast
Change-Id: Id23987edcff82621cbe932b4273fec0371bd481b
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/filtnav.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 3a021f1070f4..8bb80d37fd65 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -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 |