diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-03-12 19:38:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-03-12 20:22:17 +0100 |
| commit | a8b6ffa99d48f12a63ee6259c2ef2836c3fdaba8 (patch) | |
| tree | b70d83488379cf98a1e9dd755e3125f31f64a3a5 /sfx2/source | |
| parent | 7a201ad4bc701a0e535b230a1613b76207f5a4ea (diff) | |
sfx2: PVS-Studio V595 'pDispatcher' pointer could be null
... but actually not.
Change-Id: Ia80b416875442dd257ab31f1426b06cc05ffa5c3
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 7aa2e8e1ff52..9b22f4e7857e 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -795,9 +795,7 @@ void SfxBindings::InvalidateShell // important so that is set correctly: pimp-> ball(Msg)Dirty pDispatcher->Flush(); - if ( !pDispatcher || - ( pImp->bAllDirty && pImp->bAllMsgDirty ) || - SfxGetpApp()->IsDowning() ) + if ((pImp->bAllDirty && pImp->bAllMsgDirty) || SfxGetpApp()->IsDowning()) { // if the next one is anyway, then all the servers are collected return; @@ -1328,9 +1326,10 @@ SfxItemSet* SfxBindings::CreateSet_Impl DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" ); DBG_ASSERT( !pImp->bMsgDirty, "CreateSet_Impl with dirty MessageServer" ); + assert(pDispatcher); const SfxSlotServer* pMsgSvr = pCache->GetSlotServer(*pDispatcher, pImp->xProv); - if(!pMsgSvr || !pDispatcher) + if (!pMsgSvr) return 0; pRealSlot = 0; |