diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-11 09:03:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-11 10:37:52 +0100 |
| commit | a8c1db54830fda16c5f5a9399bf11616570342da (patch) | |
| tree | 29142f44b9d9970434708165a221dc8bcda1871e /sw | |
| parent | d35061b21b1ae4f1dcd5d451af831a6a00a3f3f0 (diff) | |
loplugin:unusedfields
Change-Id: I9f11c29a5bcb3512717ad01962f5645de96afe0b
Reviewed-on: https://gerrit.libreoffice.org/64918
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/inc/UndoTable.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/undo/untbl.cxx | 21 |
2 files changed, 11 insertions, 14 deletions
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index f2dc0b705e55..5b6c07bccc70 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -178,8 +178,8 @@ class SwUndoTableNdsChg : public SwUndo std::unique_ptr< std::set<BoxMove> > m_pNewSttNds; std::unique_ptr<SwUndoSaveSections> m_pDelSects; long m_nMin, m_nMax; // for redo of delete column - sal_uLong m_nSttNode, m_nCurrBox; - sal_uInt16 m_nCount, m_nRelDiff, m_nAbsDiff; + sal_uLong m_nSttNode; + sal_uInt16 m_nCount; TableChgWidthHeightType m_nSetColType; bool const m_bFlag; bool const m_bSameHeight; // only used for SplitRow diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 7b88f1d8d93d..5b9957eea5f1 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -1471,8 +1471,8 @@ SwUndoTableNdsChg::SwUndoTableNdsChg( SwUndoId nAction, sal_uInt16 nCnt, bool bFlg, bool bSmHght ) : SwUndo( nAction, rTableNd.GetDoc() ), m_nMin( nMn ), m_nMax( nMx ), - m_nSttNode( rTableNd.GetIndex() ), m_nCurrBox( 0 ), - m_nCount( nCnt ), m_nRelDiff( 0 ), m_nAbsDiff( 0 ), + m_nSttNode( rTableNd.GetIndex() ), + m_nCount( nCnt ), m_nSetColType( TableChgWidthHeightType::InvalidPos ), m_bFlag( bFlg ), m_bSameHeight( bSmHght ) @@ -1808,9 +1808,8 @@ void SwUndoTableNdsChg::RedoImpl(::sw::UndoRedoContext & rContext) rDoc.InsertCol( aSelBoxes, m_nCount, m_bFlag ); else { - SwTableBox* pBox = pTableNd->GetTable().GetTableBox( m_nCurrBox ); - rDoc.SetColRowWidthHeight( *pBox, m_nSetColType, m_nAbsDiff, - m_nRelDiff ); + SwTableBox* pBox = pTableNd->GetTable().GetTableBox( 0 ); + rDoc.SetColRowWidthHeight( *pBox, m_nSetColType, 0, 0 ); } break; @@ -1820,10 +1819,10 @@ void SwUndoTableNdsChg::RedoImpl(::sw::UndoRedoContext & rContext) else { SwTable& rTable = pTableNd->GetTable(); - SwTableBox* pBox = rTable.GetTableBox( m_nCurrBox ); + SwTableBox* pBox = rTable.GetTableBox( 0 ); TableChgMode eOldMode = rTable.GetTableChgMode(); rTable.SetTableChgMode( static_cast<TableChgMode>(m_nCount) ); - rDoc.SetColRowWidthHeight( *pBox, m_nSetColType, m_nAbsDiff, m_nRelDiff ); + rDoc.SetColRowWidthHeight( *pBox, m_nSetColType, 0, 0 ); rTable.SetTableChgMode( eOldMode ); } break; @@ -1852,7 +1851,7 @@ void SwUndoTableNdsChg::RedoImpl(::sw::UndoRedoContext & rContext) aMsgHint.m_eFlags = TBL_BOXPTR; rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint ); - SwTableBox* pBox = rTable.GetTableBox( m_nCurrBox ); + SwTableBox* pBox = rTable.GetTableBox( 0 ); TableChgMode eOldMode = rTable.GetTableChgMode(); rTable.SetTableChgMode( static_cast<TableChgMode>(m_nCount) ); @@ -1866,14 +1865,12 @@ void SwUndoTableNdsChg::RedoImpl(::sw::UndoRedoContext & rContext) case TableChgWidthHeightType::ColRight: case TableChgWidthHeightType::CellLeft: case TableChgWidthHeightType::CellRight: - rTable.SetColWidth( *pBox, m_nSetColType, m_nAbsDiff, - m_nRelDiff, &pUndo ); + rTable.SetColWidth( *pBox, m_nSetColType, 0, 0, &pUndo ); break; case TableChgWidthHeightType::RowBottom: case TableChgWidthHeightType::CellTop: case TableChgWidthHeightType::CellBottom: - rTable.SetRowHeight( *pBox, m_nSetColType, m_nAbsDiff, - m_nRelDiff, &pUndo ); + rTable.SetRowHeight( *pBox, m_nSetColType, 0, 0, &pUndo ); break; default: break; } |