summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-01 16:24:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-10-01 20:28:58 +0100
commitab54489c3a9c24a9f85572a1e442988124f038a4 (patch)
tree2800bc9f67d04019fe2005af2bdd6a13b85bb078 /sw
parent39a6d582a5a98f073ccb8e2bdd6832ace5eb3ca9 (diff)
coverity#704894 Explicit NULL derefenced
Change-Id: If1e812f9b3c93c8e81817dc599d1d732dbc68b0c
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/atrfrm.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 1b11a2874195..5932f59d5a16 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2836,7 +2836,7 @@ void SwFlyFrmFmt::MakeFrms()
if( bAdd )
{
- SwFlyFrm *pFly = 0;
+ SwFlyFrm *pFly;
switch( aAnchorAttr.GetAnchorId() )
{
case FLY_AT_FLY:
@@ -2848,12 +2848,12 @@ void SwFlyFrmFmt::MakeFrms()
pFly = new SwFlyAtCntFrm( this, pFrm, pFrm );
break;
+ default:
+ assert(false && "Neuer Ankertyp" );
+ //fall-through
case FLY_AS_CHAR:
pFly = new SwFlyInCntFrm( this, pFrm, pFrm );
break;
- default:
- OSL_ENSURE( false, "Neuer Ankertyp" );
- break;
}
pFrm->AppendFly( pFly );
SwPageFrm *pPage = pFly->FindPageFrm();