Avoid else after return and make code more readable

Change-Id: I3bffc7aa916c2408dfb981837c58e90d7d4b16e7

1 files changed, 40 insertions, 44 deletions

diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 8c1bc56f2bcb..263d0fb7e08d 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -313,55 +313,51 @@ bool SwTxtFrm::FormatEmpty()
         SVX_LINE_SPACE_FIX == rSpacing.GetLineSpaceRule() ||
         aSet.GetLRSpace().IsAutoFirst() ) )
         return false;
-    else
-    {
-        SwTxtFly aTxtFly( this );
-        SwRect aRect;
-        bool bFirstFlyCheck = 0 != Prt().Height();
-        if ( !bCollapse && bFirstFlyCheck &&
-             aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
-            return false;
-        else
-        {
-            SwTwips nHeight = EmptyHeight();
 
-            if ( GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() &&
-                 IsInDocBody() )
-            {
-                GETGRID( FindPageFrm() )
-                if ( pGrid )
-                    nHeight = pGrid->GetBaseHeight() + pGrid->GetRubyHeight();
-            }
+    SwTxtFly aTxtFly( this );
+    SwRect aRect;
+    bool bFirstFlyCheck = 0 != Prt().Height();
+    if ( !bCollapse && bFirstFlyCheck &&
+            aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
+        return false;
 
-            SWRECTFN( this )
-            const SwTwips nChg = nHeight - (Prt().*fnRect->fnGetHeight)();
+    SwTwips nHeight = EmptyHeight();
 
-            if( !nChg )
-                SetUndersized( false );
-            AdjustFrm( nChg );
+    if ( GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() &&
+            IsInDocBody() )
+    {
+        GETGRID( FindPageFrm() )
+        if ( pGrid )
+            nHeight = pGrid->GetBaseHeight() + pGrid->GetRubyHeight();
+    }
 
-            if( HasBlinkPor() )
-            {
-                ClearPara();
-                ResetBlinkPor();
-            }
-            SetCacheIdx( MSHRT_MAX );
-            if( !IsEmpty() )
-            {
-                SetEmpty( true );
-                SetCompletePaint();
-            }
-            if( !bCollapse && !bFirstFlyCheck &&
-                 aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
-                return false;
-
-            // #i35635# - call method <HideAndShowObjects()>
-            // to assure that objects anchored at the empty paragraph are
-            // correctly visible resp. invisible.
-            HideAndShowObjects();
-            return true;
-        }
+    SWRECTFN( this )
+    const SwTwips nChg = nHeight - (Prt().*fnRect->fnGetHeight)();
+
+    if( !nChg )
+        SetUndersized( false );
+    AdjustFrm( nChg );
+
+    if( HasBlinkPor() )
+    {
+        ClearPara();
+        ResetBlinkPor();
     }
+    SetCacheIdx( MSHRT_MAX );
+    if( !IsEmpty() )
+    {
+        SetEmpty( true );
+        SetCompletePaint();
+    }
+    if( !bCollapse && !bFirstFlyCheck &&
+            aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
+        return false;
+
+    // #i35635# - call method <HideAndShowObjects()>
+    // to assure that objects anchored at the empty paragraph are
+    // correctly visible resp. invisible.
+    HideAndShowObjects();
+    return true;
 }
 
 bool SwTxtFrm::FillRegister( SwTwips& rRegStart, KSHORT& rRegDiff )