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

[Miklos Vajna]

 sw/source/core/layout/tabfrm.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 58843f4db5ac4769b603cc65251d63d65b06bea4
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Fri Oct 20 10:41:26 2017 +0200

    sw: fix unusual boolean prefix for pointer in tabfrm
    
    Change-Id: I0a0e896c57e8b6d659e0038bbbd89996aedb1147
    Reviewed-on: https://gerrit.libreoffice.org/43588
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index ec2e72209252..14222bd8531f 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -662,7 +662,7 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, 
SwRowFrame& rFollowLine,
 
     // Lock this tab frame and its follow
     bool bUnlockMaster = false;
-    SwFlowFrame * bUnlockFollow = nullptr;
+    SwFlowFrame * pFollow = nullptr;
     SwTabFrame* pMaster = rTab.IsFollow() ? rTab.FindMaster() : nullptr;
     if ( pMaster && !pMaster->IsJoinLocked() )
     {
@@ -671,8 +671,8 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, 
SwRowFrame& rFollowLine,
     }
     if ( !rTab.GetFollow()->IsJoinLocked() )
     {
-        bUnlockFollow = rTab.GetFollow();
-        ::TableSplitRecalcLock( bUnlockFollow );
+        pFollow = rTab.GetFollow();
+        ::TableSplitRecalcLock( pFollow );
     }
 
     bool bInSplit = rLastLine.IsInSplit();
@@ -688,8 +688,8 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, 
SwRowFrame& rFollowLine,
     rLastLine.SetInSplit(bInSplit);
 
     // Unlock this tab frame and its follow
-    if ( bUnlockFollow )
-        ::TableSplitRecalcUnlock( bUnlockFollow );
+    if ( pFollow )
+        ::TableSplitRecalcUnlock( pFollow );
     if ( bUnlockMaster )
         ::TableSplitRecalcUnlock( pMaster );
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits