diff options
Diffstat (limited to 'sw/source/filter/html/htmltab.cxx')
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 592ae51b079c..d117be32677b 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -33,7 +32,6 @@ #include <svtools/htmlkywd.hxx> #include <svl/urihelper.hxx> - #include <fmtornt.hxx> #include <frmfmt.hxx> #include <fmtfsize.hxx> @@ -63,7 +61,6 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; - static HTMLOptionEnum aHTMLTblVAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE }, @@ -155,7 +152,6 @@ public: sal_uInt16 GetContextStAttrMin() const { return nContextStAttrMin; } }; - // Cell content is a linked list with SwStartNodes and // HTMLTables. @@ -199,7 +195,6 @@ public: SwHTMLTableLayoutCnts *CreateLayoutInfo(); }; - // Cell of a HTML table class HTMLTableCell { @@ -269,7 +264,6 @@ public: sal_Bool IsCovered() const { return mbCovered; } }; - // Row of a HTML table typedef boost::ptr_vector<HTMLTableCell> HTMLTableCells; @@ -326,7 +320,6 @@ public: sal_Bool IsSplitable() const { return bSplitable; } }; - // Column of a HTML table class HTMLTableColumn { @@ -368,7 +361,6 @@ public: SwHTMLTableLayoutColumn *CreateLayoutInfo(); }; - // HTML table typedef boost::ptr_vector<HTMLTableRow> HTMLTableRows; @@ -454,7 +446,6 @@ class HTMLTable SwHTMLTableLayout *pLayoutInfo; - // die folgenden Parameter stammen aus der dem <TABLE>-Tag sal_uInt16 nWidth; // die Breite der Tabelle sal_uInt16 nHeight; // absolute Hoehe der Tabelle @@ -522,7 +513,6 @@ class HTMLTable void InheritVertBorders( const HTMLTable *pParent, sal_uInt16 nCol, sal_uInt16 nColSpan ); - // Setzen der Umrandung anhand der Benutzervorgaben void SetBorders(); @@ -651,8 +641,6 @@ public: sal_Bool IsOverflowing() const { return nBoxes > 64000; } }; - - void HTMLTableCnts::InitCtor() { pNext = 0; @@ -710,7 +698,6 @@ SwHTMLTableLayoutCnts *HTMLTableCnts::CreateLayoutInfo() return pLayoutInfo; } - HTMLTableCell::HTMLTableCell(): pContents(0), pBGBrush(0), @@ -805,7 +792,6 @@ SwHTMLTableLayoutCell *HTMLTableCell::CreateLayoutInfo() bRelWidth, bNoWrap ); } - HTMLTableRow::HTMLTableRow( sal_uInt16 nCells ): pCells(new HTMLTableCells), bIsEndOfGroup(sal_False), @@ -905,7 +891,6 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells ) pCells->erase( pCells->begin() + nCells, pCells->end() ); } - HTMLTableColumn::HTMLTableColumn(): bIsEndOfGroup(sal_False), nWidth(0), bRelWidth(sal_False), @@ -960,8 +945,6 @@ inline SwFrmFmt *HTMLTableColumn::GetFrmFmt( sal_Bool bBorderLine, return aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)]; } - - void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) { pResizeDrawObjs = 0; @@ -1123,7 +1106,6 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab, pColumns->push_back( new HTMLTableColumn ); } - HTMLTable::~HTMLTable() { delete pResizeDrawObjs; @@ -1224,7 +1206,6 @@ void HTMLTable::ProtectRowSpan( sal_uInt16 nRow, sal_uInt16 nCol, sal_uInt16 nRo } } - // Suchen des SwStartNodes der letzten belegten Vorgaengerbox const SwStartNode* HTMLTable::GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 nCol ) const { @@ -1284,7 +1265,6 @@ const SwStartNode* HTMLTable::GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 n : pPrevCnts->GetTable()->GetPrevBoxStartNode( USHRT_MAX, USHRT_MAX ) ); } - static sal_Bool IsBoxEmpty( const SwTableBox *pBox ) { const SwStartNode *pSttNd = pBox->GetSttNd(); @@ -1659,7 +1639,6 @@ SwTableBox *HTMLTable::NewTableBox( const SwStartNode *pStNd, return pBox; } - static void ResetLineFrmFmtAttrs( SwFrmFmt *pFrmFmt ) { pFrmFmt->ResetFmtAttr( RES_FRM_SIZE ); @@ -1734,7 +1713,6 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper, ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight ); } - SwTableBoxes& rBoxes = pLine->GetTabBoxes(); sal_uInt16 nStartCol = nLeftCol; @@ -1922,7 +1900,7 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent, // ob eine Umrandung der Tabelle noetig/moeglich ist, weil das davon // abhaengt, ob "Filler"-Zellen eingefuegt werden. Hier werden deshalb // erstmal nur Informationen gesammelt - // + if( 0==nRow && pParent->bTopBorder && bFirstPara ) { bTopBorder = true; @@ -1938,7 +1916,6 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent, : pParent->aBorderLine; } - // Die Child Tabelle darf keinen oberen oder linken Rahmen bekommen, // wenn der bereits durch die umgebende Tabelle gesetzt ist. // Sie darf jedoch immer einen oberen Rand bekommen, wenn die Tabelle @@ -2082,7 +2059,6 @@ inline HTMLTableCell *HTMLTable::GetCell( sal_uInt16 nRow, return (*pRows)[nRow].GetCell( nCell ); } - SvxAdjust HTMLTable::GetInheritedAdjust() const { SvxAdjust eAdjust = (nCurCol<nCols ? ((*pColumns)[nCurCol]).GetAdjust() @@ -2297,7 +2273,6 @@ void HTMLTable::CloseRow( sal_Bool bEmpty ) break; } - nCurRow++; } @@ -2355,7 +2330,6 @@ void HTMLTable::InsertCol( sal_uInt16 nSpan, sal_uInt16 nColWidth, bool bRelWidt nCurCol = nColsReq; } - void HTMLTable::CloseTable() { sal_uInt16 i; @@ -2644,7 +2618,6 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT ); pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT ); - _MakeTable( pNewBox ); // und noch ggf. rechts eine Zelle einfuegen @@ -2834,7 +2807,6 @@ void _HTMLTableContext::RestorePREListingXMP( SwHTMLParser& rParser ) rParser.StartListing(); } - const SwStartNode *SwHTMLParser::InsertTableSection ( const SwStartNode *pPrevStNd ) { @@ -2937,7 +2909,6 @@ SwStartNode *SwHTMLParser::InsertTempTableCaptionSection() return pStNd; } - sal_Int32 SwHTMLParser::StripTrailingLF() { sal_Int32 nStripped = 0; @@ -3037,7 +3008,6 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor, return pBrushItem; } - class _SectionSaveStruct : public SwPendingStackData { sal_uInt16 nBaseFontStMinSave, nFontStMinSave, nFontStHeadStartSave; @@ -3091,7 +3061,6 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser ) rParser.aBaseFontStack.end() ); rParser.nBaseFontStMin = nBaseFontStMinSave; - nMin = rParser.nFontStMin; if( rParser.aFontStack.size() > nMin ) rParser.aFontStack.erase( rParser.aFontStack.begin() + nMin, @@ -3116,7 +3085,6 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser ) rParser.aParaAttrs.clear(); } - class _CellSaveStruct : public _SectionSaveStruct { OUString aStyle, aId, aClass, aLang, aDir; @@ -3169,7 +3137,6 @@ public: void CheckNoBreak( const SwPosition& rPos, SwDoc *pDoc ); }; - _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, sal_Bool bHd, sal_Bool bReadOpt ) : _SectionSaveStruct( rParser ), @@ -3440,8 +3407,6 @@ void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ ) } } - - HTMLTableCnts *SwHTMLParser::InsertTableContents( sal_Bool bHead ) { @@ -4009,7 +3974,6 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, pSubTable->GetTableAdjust(sal_False)!= SVX_ADJUST_RIGHT, "links oder rechts ausgerichtete Tabellen gehoehren in Rahmen" ); - HTMLTableCnts *pParentContents = pSubTable->GetParentContents(); if( pParentContents ) @@ -4205,7 +4169,6 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, delete pSaveStruct; } - class _RowSaveStruct : public SwPendingStackData { public: @@ -4218,7 +4181,6 @@ public: {} }; - void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions, SvxAdjust eGrpAdjust, sal_Int16 eGrpVertOri ) @@ -4595,7 +4557,6 @@ struct _TblColGrpSaveStruct : public SwPendingStackData inline _TblColGrpSaveStruct(); - inline void CloseColGroup( HTMLTable *pTable ); }; @@ -4605,7 +4566,6 @@ inline _TblColGrpSaveStruct::_TblColGrpSaveStruct() : eColGrpVertOri( text::VertOrientation::TOP ) {} - inline void _TblColGrpSaveStruct::CloseColGroup( HTMLTable *pTable ) { pTable->CloseColGroup( nColGrpSpan, nColGrpWidth, @@ -5049,7 +5009,6 @@ public: _TblSaveStruct::~_TblSaveStruct() {} - void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ) { pCurTable->MakeTable( 0, nWidth ); @@ -5084,7 +5043,6 @@ void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc rPos = *pTCntxt->GetPos(); } - HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, SvxAdjust eParentAdjust ) : nCols( 0 ), @@ -5220,7 +5178,6 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, } } - HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, sal_Bool bIsParentHead, sal_Bool bHasParentSection, @@ -5509,5 +5466,4 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, return pRetTbl; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |