summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-19 11:39:13 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-19 15:37:55 +0000
commitae70ec25de95fbdb039a245ab01e7bf633d5960f (patch)
tree8d0b5fc2d74a6901252d4eb649703d6c36ef4484 /sd
parentc9c1fa961c437b1ba9d393070453bef9b0543771 (diff)
coverity#705874 Dereference before null check
Change-Id: I41388981823b4e27a63aa6ecb860da8abc05f5b4
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/drtxtob1.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 9605277102c0..9008f55f840f 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -100,7 +100,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
if( pArgs )
{
SdDrawDocument& rDoc = mpView->GetDoc();
- OSL_ASSERT (mpViewShell->GetViewShell()!=NULL);
+ assert(mpViewShell->GetViewShell());
rtl::Reference<FuPoor> xFunc( FuTemplate::Create( mpViewShell, static_cast< ::sd::Window*>( mpViewShell->GetViewShell()->GetWindow()), mpView, &rDoc, rReq ) );
if(xFunc.is())
@@ -110,7 +110,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
if( rReq.GetSlot() == SID_STYLE_APPLY )
{
- if( mpViewShell && mpViewShell->GetViewFrame() )
+ if (mpViewShell->GetViewFrame())
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_APPLY );
}
}