From 1abef5bf64a7f3b5799fc597a4e486c45ace758f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 15 Dec 2010 09:13:59 +0100 Subject: undoapi: SwNodes: remove obsolete operator[](SwNodeIndex&) --- sw/source/filter/html/htmltab.cxx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'sw/source/filter/html/htmltab.cxx') diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index df9f43fafa41..111fce4863dc 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2894,7 +2894,7 @@ const SwStartNode *SwHTMLParser::InsertTableSection const SwStartNode *pStNd; if( pTable && pTable->bFirstCell ) { - SwNode *pNd = pDoc->GetNodes()[pPam->GetPoint()->nNode]; + SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode(); pNd->GetTxtNode()->ChgFmtColl( pColl ); pStNd = pNd->FindTableBoxStartNode(); pTable->bFirstCell = sal_False; @@ -2937,7 +2937,7 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId ) SwTxtFmtColl *pColl = pCSS1Parser->GetTxtCollFromPool( nPoolId ); - SwNode *pNd = pDoc->GetNodes()[pPam->GetPoint()->nNode]; + SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode(); const SwStartNode *pStNd; if( pTable && pTable->bFirstCell ) { @@ -3453,7 +3453,7 @@ void _CellSaveStruct::EndNoBreak( const SwPosition& rPos ) } } -void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc *pDoc ) +void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ ) { if( pCnts && pCurrCnts==pCnts ) { @@ -3472,8 +3472,7 @@ void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc *pDoc ) } else if( nNoBreakEndCntntPos + 1 == rPos.nContent.GetIndex() ) { - const SwTxtNode *pTxtNd = - pDoc->GetNodes()[rPos.nNode]->GetTxtNode(); + SwTxtNode const*const pTxtNd(rPos.nNode.GetNode().GetTxtNode()); if( pTxtNd ) { sal_Unicode cLast = @@ -3866,11 +3865,11 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, pPam->Move( fnMoveBackward ); } - const SwNode *pNd = pDoc->GetNodes()[pPam->GetPoint()->nNode]; + SwNode const*const pNd = & pPam->GetPoint()->nNode.GetNode(); if( !bAppended && !bForceFrame ) { - SwTxtNode* pOldTxtNd = - pDoc->GetNodes()[pSavePos->nNode]->GetTxtNode(); + SwTxtNode *const pOldTxtNd = + pSavePos->nNode.GetNode().GetTxtNode(); ASSERT( pOldTxtNd, "Wieso stehen wir in keinem Txt-Node?" ); SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt(); @@ -3939,7 +3938,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, } } - const SwNode *pNd = pDoc->GetNodes()[pPam->GetPoint()->nNode]; + SwNode const*const pNd = & pPam->GetPoint()->nNode.GetNode(); const SwStartNode *pStNd = (pTable->bFirstCell ? pNd->FindTableNode() : pNd->FindTableBoxStartNode() ); @@ -4043,8 +4042,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, // koennen wir erneut eine echte Tabelle aufmachen. // Wir erkennen das daran, dass wir keinen // Tabellen-Node mehr finden. - bTopTable = pDoc->GetNodes()[pPam->GetPoint()->nNode] - ->FindTableNode() == 0; + bTopTable = (0 == + pPam->GetPoint()->nNode.GetNode().FindTableNode()); // Wenn im aktuellen Absatz Flys verankert sind, // muss die neue Tabelle in einen Rahmen. -- cgit From 7f33ed417b2e29e5470724ea76967f64699a2662 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Mon, 17 Jan 2011 15:06:54 +0100 Subject: removetooltypes01: #i112600# Remove tools types from sw --- sw/source/filter/html/htmltab.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sw/source/filter/html/htmltab.cxx') diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index df9f43fafa41..8ba60daf881b 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2735,7 +2735,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, if( GetBGBrush() ) pSwTable->GetFrmFmt()->SetFmtAttr( *GetBGBrush() ); - ((SwTable *)pSwTable)->SetRowsToRepeat( static_cast< USHORT >(nHeadlineRepeat) ); + ((SwTable *)pSwTable)->SetRowsToRepeat( static_cast< sal_uInt16 >(nHeadlineRepeat) ); ((SwTable *)pSwTable)->GCLines(); sal_Bool bIsInFlyFrame = pContext && pContext->GetFrmFmt(); @@ -3497,15 +3497,15 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents( { // eine neue Section anlegen, der PaM steht dann darin const SwStartNode *pStNd = - InsertTableSection( static_cast< USHORT >(bHead ? RES_POOLCOLL_TABLE_HDLN + InsertTableSection( static_cast< sal_uInt16 >(bHead ? RES_POOLCOLL_TABLE_HDLN : RES_POOLCOLL_TABLE) ); if( GetNumInfo().GetNumRule() ) { // 1. Absatz auf nicht numeriert setzen - BYTE nLvl = GetNumInfo().GetLevel(); + sal_uInt8 nLvl = GetNumInfo().GetLevel(); // --> OD 2008-04-02 #refactorlists# -// SetNoNum(&nLvl, TRUE); +// SetNoNum(&nLvl, sal_True); // SetNodeNum( nLvl); SetNodeNum( nLvl, false ); } @@ -4204,7 +4204,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, !pSaveStruct->IsInSection(), "Section oder nicht, das ist hier die Frage" ); const SwStartNode *pStNd = - InsertTableSection( static_cast< USHORT >(pSaveStruct->IsHeaderCell() + InsertTableSection( static_cast< sal_uInt16 >(pSaveStruct->IsHeaderCell() ? RES_POOLCOLL_TABLE_HDLN : RES_POOLCOLL_TABLE )); const SwEndNode *pEndNd = pStNd->EndOfSectionNode(); -- cgit