diff options
Diffstat (limited to 'sw/source/filter/html/htmltab.cxx')
-rw-r--r-- | sw/source/filter/html/htmltab.cxx | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 0d659d7dfd65..12153fb74c4d 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -82,6 +82,8 @@ static HTMLOptionEnum<sal_Int16> const aHTMLTableVAlignTable[] = // table tags options +namespace { + struct HTMLTableOptions { sal_uInt16 nCols; @@ -165,6 +167,8 @@ public: size_t GetContextStAttrMin() const { return nContextStAttrMin; } }; +} + // Cell content is a linked list with SwStartNodes and // HTMLTables. @@ -208,6 +212,8 @@ public: const std::shared_ptr<SwHTMLTableLayoutCnts>& CreateLayoutInfo(); }; +namespace { + // Cell of a HTML table class HTMLTableCell { @@ -271,9 +277,13 @@ public: bool IsCovered() const { return mbCovered; } }; +} + // Row of a HTML table typedef std::vector<HTMLTableCell> HTMLTableCells; +namespace { + class HTMLTableRow { HTMLTableCells m_aCells; ///< cells of the row @@ -365,6 +375,8 @@ public: std::unique_ptr<SwHTMLTableLayoutColumn> CreateLayoutInfo(); }; +} + // HTML table typedef std::vector<HTMLTableRow> HTMLTableRows; @@ -3874,6 +3886,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, xSaveStruct.reset(); } +namespace { + class RowSaveStruct : public SwPendingData { public: @@ -3886,6 +3900,8 @@ public: {} }; +} + void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions, SvxAdjust eGrpAdjust, sal_Int16 eGrpVertOri ) @@ -4245,6 +4261,8 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, // now we stand (perhaps) in front of <TBODY>,... or </TABLE> } +namespace { + struct TableColGrpSaveStruct : public SwPendingData { sal_uInt16 nColGrpSpan; @@ -4258,6 +4276,8 @@ struct TableColGrpSaveStruct : public SwPendingData inline void CloseColGroup( HTMLTable *pTable ); }; +} + inline TableColGrpSaveStruct::TableColGrpSaveStruct() : nColGrpSpan( 1 ), nColGrpWidth( 0 ), bRelColGrpWidth( false ), eColGrpAdjust( SvxAdjust::End ), @@ -4677,6 +4697,8 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) *m_pPam->GetPoint() = xSaveStruct->GetPos(); } +namespace { + class TableSaveStruct : public SwPendingData { public: @@ -4692,6 +4714,8 @@ public: void MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ); }; +} + void TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ) { m_xCurrentTable->MakeTable(nullptr, nWidth); |