diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-12 11:08:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-12 11:08:37 +0200 |
| commit | 533fd775d51472e6cff93487a27136f67f06d77f (patch) | |
| tree | 7746c1d5019b0c696fbfa289cd562ace5514a5ba | |
| parent | a966293cad1f5e6ad7798991dc4c8d1fdb83a5cd (diff) | |
Massage code to avoid warnings
Change-Id: Iec529b4750770c52aa0a746390ba272ce6390fb5
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index ce8efe57e781..4f518262723c 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -3002,7 +3002,7 @@ void SwFlyFrameFormat::MakeFrames() if( bAdd ) { - SwFlyFrame *pFly; + SwFlyFrame *pFly = nullptr; // avoid warnings switch( aAnchorAttr.GetAnchorId() ) { case FLY_AT_FLY: @@ -3014,12 +3014,12 @@ void SwFlyFrameFormat::MakeFrames() pFly = new SwFlyAtContentFrame( this, pFrame, pFrame ); break; - default: - assert(false && "Neuer Ankertyp" ); - SAL_FALLTHROUGH; case FLY_AS_CHAR: pFly = new SwFlyInContentFrame( this, pFrame, pFrame ); break; + + default: + assert(false && "Neuer Ankertyp" ); } pFrame->AppendFly( pFly ); pFly->GetFormat()->SetObjTitle(GetObjTitle()); |