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

Zolnai Tamás tamas.zolnai at collabora.com
Sat Sep 3 21:42:59 UTC 2016


 sw/source/core/layout/calcmove.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit dfc2fa4a9bf9e277461d77fb4004086c089187a8
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sat Sep 3 23:31:20 2016 +0200

    cppcheck: variableScope
    
    Change-Id: Idd96330afaee66dcbeddc62c93691139c2a1830d

diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 8afb53c..ef51393 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1248,14 +1248,13 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/)
 
     SWRECTFN( this )
 
-    bool bMoveable;
-
     while ( !mbValidPos || !mbValidSize || !mbValidPrtArea )
     {
         // - loop prevention
         SwRect aOldFrame_StopFormat( Frame() );
         SwRect aOldPrt_StopFormat( Prt() );
-        if ( (bMoveable = IsMoveable()) )
+        bool bMoveable = IsMoveable();
+        if (bMoveable)
         {
             SwFrame *pPre = GetIndPrev();
             if ( CheckMoveFwd( bMakePage, bKeep, bMovedBwd ) )


More information about the Libreoffice-commits mailing list