diff options
author | Chris Laplante <mostthingsweb@gmail.com> | 2014-04-21 19:28:47 -0400 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-04-24 04:39:51 +0000 |
commit | ba39f1bf9b29f58b7593f01d552a4f1a42a637cb (patch) | |
tree | ab251de2ca0dbb92ab843bfa73c674adebb0ebf5 /sw/source/core/table | |
parent | bff954c0c4e5f9acf18bfd9ae796bc5a937b7ff6 (diff) |
Finish cleaning up ASCII art in the sw module
Change-Id: If4f11093b791902514dee8e216c92f66b075211d
Reviewed-on: https://gerrit.libreoffice.org/9117
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sw/source/core/table')
-rw-r--r-- | sw/source/core/table/swnewtable.cxx | 24 | ||||
-rw-r--r-- | sw/source/core/table/swtable.cxx | 57 |
2 files changed, 14 insertions, 67 deletions
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index cbbda808e332..2342ac9fd293 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -1186,19 +1186,17 @@ void SwTable::InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nRowIdx, sal_uInt16 nCnt typedef std::pair< sal_uInt16, sal_uInt16 > SwLineOffset; typedef std::list< SwLineOffset > SwLineOffsetArray; -/****************************************************************************** -When a couple of table boxes has to be split, -lcl_SophisticatedFillLineIndices delivers the information where and how many -rows have to be inserted. -Input - rTable: the table to manipulate - rBoxes: an array of boxes to split - nCnt: how many parts are wanted -Output - rArr: a list of pairs ( line index, number of lines to insert ) - -******************************************************************************/ - +/* +* When a couple of table boxes has to be split, +* lcl_SophisticatedFillLineIndices delivers the information where and how many +* rows have to be inserted. +* Input +* rTable: the table to manipulate +* rBoxes: an array of boxes to split +* nCnt: how many parts are wanted +* Output +* rArr: a list of pairs ( line index, number of lines to insert ) +*/ static void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr, const SwTable& rTable, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) { diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 77bd9e6bfe81..2b4354dc368e 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -242,11 +242,6 @@ void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd, } } -/************************************************************************* -|* -|* SwTable::SwTable() -|* -|*************************************************************************/ SwTable::SwTable( SwTableFmt* pFmt ) : SwClient( pFmt ), pHTMLLayout( 0 ), @@ -307,11 +302,6 @@ SwTable::~SwTable() delete pHTMLLayout; } -/************************************************************************* -|* -|* SwTable::Modify() -|* -|*************************************************************************/ static void FmtInArr( std::vector<SwFmt*>& rFmtArr, SwFmt* pBoxFmt ) { std::vector<SwFmt*>::const_iterator it = std::find( rFmtArr.begin(), rFmtArr.end(), pBoxFmt ); @@ -420,11 +410,6 @@ void SwTable::AdjustWidths( const long nOld, const long nNew ) ::lcl_ModifyLines( aLines, nOld, nNew, aFmtArr, true ); } -/************************************************************************* -|* -|* SwTable::GetTabCols() -|* -|*************************************************************************/ static void lcl_RefreshHidden( SwTabCols &rToFill, size_t nPos ) { for ( size_t i = 0; i < rToFill.Count(); ++i ) @@ -660,11 +645,6 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, } } -/************************************************************************* -|* -|* SwTable::SetTabCols() -|* -|*************************************************************************/ // Structure for parameter passing struct Parm { @@ -1331,13 +1311,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, CHECK_TABLE( *this ) } -/************************************************************************* -|* -|* const SwTableBox* SwTable::GetTblBox( const Strn?ng& rName ) const -|* return the pointer of the box specified. -|* -|*************************************************************************/ - +// return the pointer of the box specified. static bool lcl_IsValidRowName( const OUString& rStr ) { bool bIsValid = true; @@ -1523,11 +1497,6 @@ bool SwTable::IsTblComplex() const return false; } -/************************************************************************* -|* -|* SwTableLine::SwTableLine() -|* -|*************************************************************************/ SwTableLine::SwTableLine( SwTableLineFmt *pFmt, sal_uInt16 nBoxes, SwTableBox *pUp ) : SwClient( pFmt ), @@ -1550,11 +1519,6 @@ SwTableLine::~SwTableLine() delete pMod; // and delete } -/************************************************************************* -|* -|* SwTableLine::ClaimFrmFmt(), ChgFrmFmt() -|* -|*************************************************************************/ SwFrmFmt* SwTableLine::ClaimFrmFmt() { // This method makes sure that this object is an exclusive SwTableLine client @@ -1671,11 +1635,6 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const return nRet; } -/************************************************************************* -|* -|* SwTableBox::SwTableBox() -|* -|*************************************************************************/ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, sal_uInt16 nLines, SwTableLine *pUp ) : SwClient( 0 ), aLines(), @@ -1780,11 +1739,6 @@ SwTableBoxFmt* SwTableBox::CheckBoxFmt( SwTableBoxFmt* pFmt ) return pFmt; } -/************************************************************************* -|* -|* SwTableBox::ClaimFrmFmt(), ChgFrmFmt() -|* -|*************************************************************************/ SwFrmFmt* SwTableBox::ClaimFrmFmt() { // This method makes sure that this object is an exclusive SwTableBox client @@ -1859,13 +1813,8 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt ) delete pOld; } -/************************************************************************* -|* -|* String SwTableBox::GetName() const -|* Return the name of this box. This is determined dynamically -|* resulting from the position in the lines/boxes/tables. -|* -|*************************************************************************/ +// Return the name of this box. This is determined dynamically +// resulting from the position in the lines/boxes/tables. void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm ) { const sal_uInt16 coDiff = 52; // 'A'-'Z' 'a' - 'z' |