summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-22 14:11:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-24 12:38:48 +0100
commit511ef1fc8a0c0d604067a23dc1879cea28626f4c (patch)
tree092e653ea37f577316ca32cb0884375700d21d25 /sw
parentdcda5569c41b33077a1795d1e147572a2d483d04 (diff)
don't need function pointers here anymore
Change-Id: Ica36573da290bfc98de99fec6ed59dbf8acb8a73 Reviewed-on: https://gerrit.libreoffice.org/63924 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/tblrwcl.cxx19
1 files changed, 8 insertions, 11 deletions
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 );
}
}