summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-24 14:52:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-24 14:56:47 +0000
commit6cfce6ead21a1c6c985d3d79cef6c584abbc7e8e (patch)
tree4cabe57128e528706502c034600b15e5efffd33a /sd
parent58f88c968c94e129630d36e70c6e59ad515ad888 (diff)
coverity#1265802 Dereference null return value
Change-Id: I1ad3470410ef3a1f4f06033c89da9adcb640b7e0
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 7fbe70014ea8..0d9635b03db3 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1170,9 +1170,8 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
*/
void SdPageObjsTLB::DoDrag()
{
- mpDropNavWin = ( mpFrame->HasChildWindow( SID_NAVIGATOR ) ) ?
- static_cast<SdNavigatorWin*>( mpFrame->GetChildWindow( SID_NAVIGATOR )->GetContextWindow( SD_MOD() ) ) :
- NULL;
+ SfxChildWindow* pWnd = mpFrame->HasChildWindow(SID_NAVIGATOR) ? mpFrame->GetChildWindow(SID_NAVIGATOR) : NULL;
+ mpDropNavWin = pWnd ? static_cast<SdNavigatorWin*>(pWnd->GetContextWindow(SD_MOD())) : NULL;
if( mpDropNavWin )
{