summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-23 13:32:33 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 14:22:43 +0000
commit2a83910e724d21b774d39f6faf4e7329a6fc5ee8 (patch)
treea25495c10d622649185ea38bc75f956f170839e5 /forms
parent09c0e5110a459d4b591385db6aebaff93c25cf10 (diff)
coverity#704644 Dereference after null check
Change-Id: I9b2aad39c54497b5b53a86cf11a754f89c012d0e
Diffstat (limited to 'forms')
-rw-r--r--forms/source/richtext/clipboarddispatcher.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 5f3d0fe6dd8a..31a3131659e5 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -176,10 +176,14 @@ namespace frm
void OPasteClipboardDispatcher::disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify )
{
OSL_ENSURE( getEditView() && getEditView()->GetWindow(), "OPasteClipboardDispatcher::disposing: EditView should not (yet) be disfunctional here!" );
- if ( getEditView() && getEditView()->GetWindow() && m_pClipListener )
- m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), sal_False );
- m_pClipListener->release();
- m_pClipListener = NULL;
+ if (m_pClipListener)
+ {
+ if (getEditView() && getEditView()->GetWindow())
+ m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), sal_False );
+
+ m_pClipListener->release();
+ m_pClipListener = NULL;
+ }
OClipboardDispatcher::disposing( _rClearBeforeNotify );
}