summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-05-07 16:28:39 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-05-08 09:56:21 +0100
commitff97a873c3f09e03e93b095c23c7930744d88705 (patch)
tree177ecaec87a5d64a567dbf0d18c944bcd6845e1f /svx
parent43d684af310266d454bd888da4f94df2c7714fc1 (diff)
coverity#736151 Dereference null return value
Change-Id: If5bc9d3a5c425ed56c27fa6b43aa7049cd5b2a06
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/navigatortreemodel.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 5f9b8cae4c5e..213eef999e76 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -635,7 +635,9 @@ namespace svxform
)
{
FmEntryData* pData = FindData(xOld, GetRootList(), true);
- DBG_ASSERT(pData && pData->ISA(FmControlData), "NavigatorTreeModel::ReplaceFormComponent : invalid argument !");
+ assert(pData && pData->ISA(FmControlData)); //NavigatorTreeModel::ReplaceFormComponent : invalid argument
+ if (!pData || !pData->ISA(FmControlData))
+ return;
((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages );
FmNavModelReplacedHint aReplacedHint( pData );