[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/core/layout/atrfrm.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 533fd775d51472e6cff93487a27136f67f06d77f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 12 11:08:37 2016 +0200

    Massage code to avoid warnings
    
    Change-Id: Iec529b4750770c52aa0a746390ba272ce6390fb5

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index ce8efe5..4f51826 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());