sw/source/core/doc/tblrwcl.cxx | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
New commits:
commit 511ef1fc8a0c0d604067a23dc1879cea28626f4c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Nov 22 14:11:50 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 24 12:38:48 2018 +0100
don't need function pointers here anymore
Change-Id: Ica36573da290bfc98de99fec6ed59dbf8acb8a73
Reviewed-on: https://gerrit.libreoffice.org/63924
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 01af5d1d4d66..46c5ebf04501 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3029,9 +3029,6 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox,
TableChgWidthHeightType eTy
const_cast<SwTableNode*>(rCurrentBox.GetSttNd()->FindTableNode()) );
bBigger = aParam.bBigger;
- FN_lcl_SetLineHeight fnSelLine = lcl_SetSelLineHeight;
- FN_lcl_SetLineHeight fnOtherLine = lcl_SetOtherLineHeight;
-
SwTableLines* pLines = &m_aLines;
// How do we get to the height?
@@ -3056,7 +3053,7 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox,
TableChgWidthHeightType eTy
if( bBigger )
bRet = true;
else
- bRet = (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
+ bRet = lcl_SetSelLineHeight( (*pLines)[ nBaseLinePos ],
aParam,
nAbsDiff, true );
if( bRet )
@@ -3064,7 +3061,7 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox,
TableChgWidthHeightType eTy
if( ppUndo )
ppUndo->reset(new SwUndoAttrTable( *aParam.pTableNd,
true ));
- (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
+ lcl_SetSelLineHeight( (*pLines)[ nBaseLinePos ], aParam,
nAbsDiff, false );
}
}
@@ -3116,7 +3113,7 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox,
TableChgWidthHeightType eTy
{
for( auto n = nStt; n < nEnd; ++n )
{
- if( !(*fnOtherLine)( (*pLines)[ n ], aParam,
+ if( !lcl_SetOtherLineHeight( (*pLines)[ n ],
aParam,
nAbsDiff, true ))
{
bRet = false;
@@ -3125,7 +3122,7 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox,
TableChgWidthHeightType eTy
}
}
else
- bRet = (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
+ bRet = lcl_SetSelLineHeight( (*pLines)[ nBaseLinePos
], aParam,
nAbsDiff, true );
}
@@ -3139,18 +3136,18 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox,
TableChgWidthHeightType eTy
if( bTop )
{
- (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
+ lcl_SetSelLineHeight( (*pLines)[ nBaseLinePos ],
aParam,
nAbsDiff, false );
for( auto n = nStt; n < nEnd; ++n )
- (*fnOtherLine)( (*pLines)[ n ], aParam1,
+ lcl_SetOtherLineHeight( (*pLines)[ n ], aParam1,
nAbsDiff, false );
}
else
{
for( auto n = nStt; n < nEnd; ++n )
- (*fnOtherLine)( (*pLines)[ n ], aParam1,
+ lcl_SetOtherLineHeight( (*pLines)[ n ], aParam1,
nAbsDiff, false );
- (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
+ lcl_SetSelLineHeight( (*pLines)[ nBaseLinePos ],
aParam,
nAbsDiff, false );
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
