summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-01-28 13:31:33 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-28 14:30:40 +0000
commit40606287d0cc48dd5ff2d98a310a1b56ca5ed388 (patch)
treef5e8af6701be307d636cf8b9e8705c3de49dadf9 /svx
parente1bacc188b84ee12c36adda71f14532172f70599 (diff)
coverity#705902 Dereference before null check
Change-Id: I3c23574125d039aa9671ef2d2fa6d2d91d3dd752
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdouno.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 1d15439dea13..8e435a96e9fa 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -540,8 +540,8 @@ uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView,
uno::Reference< awt::XControl > xControl;
SdrPageView* pPageView = _rView.GetSdrPageView();
- OSL_ENSURE( GetPage() == pPageView->GetPage(), "SdrUnoObj::GetUnoControl: This object is not displayed in that particular view!" );
- if ( GetPage() != pPageView->GetPage() )
+ OSL_ENSURE( pPageView && GetPage() == pPageView->GetPage(), "SdrUnoObj::GetUnoControl: This object is not displayed in that particular view!" );
+ if ( !pPageView || GetPage() != pPageView->GetPage() )
return NULL;
SdrPageWindow* pPageWindow = pPageView ? pPageView->FindPageWindow( _rOut ) : NULL;