summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-05-09 09:23:28 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-05-09 09:43:16 +0100
commit0baedc980495bc07491906f1bac4acf3ad040f94 (patch)
treeaa7cbbfc645bb364df82bb7b5086577b5b24ddaf
parent0698ccf040c8805cb0e33e3786c5780f6048a5ca (diff)
coverity#1209792 Dereference before null check
Change-Id: Ie4ff7acb0b9116fbdab42c6bc0088a43e98871fc
-rw-r--r--svx/source/form/filtnav.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index e00206986d1e..d774574d2a6e 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1404,11 +1404,9 @@ namespace
FmFilterItems* getTargetItems(SvTreeListEntry* _pTarget)
{
FmFilterData* pData = static_cast<FmFilterData*>(_pTarget->GetUserData());
- FmFilterItems* pTargetItems = pData->ISA(FmFilterItems)
- ?
- PTR_CAST(FmFilterItems,pData)
- :
- PTR_CAST(FmFilterItems,pData->GetParent());
+ FmFilterItems* pTargetItems = dynamic_cast<FmFilterItems*>(pData);
+ if (!pTargetItems)
+ pTargetItems = dynamic_cast<FmFilterItems*>(pData->GetParent());
return pTargetItems;
}
}