diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-14 12:05:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-14 15:30:14 +0200 |
| commit | 9a2c347e76c330b45504c8219510c9ef86503b86 (patch) | |
| tree | 5b8065100740e67350a431c1ce3b69ef7e39446e /sw | |
| parent | 97e49876086bbdcb58ae0c22d9145c453f239468 (diff) | |
inline some use-once typedefs
Change-Id: Ifefdb1ad20d09e257064171e458b2eb33065f5de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100733
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/txtnode/modeltoviewhelper.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx index 4675a632a065..b0ba367faa25 100644 --- a/sw/source/core/txtnode/modeltoviewhelper.cxx +++ b/sw/source/core/txtnode/modeltoviewhelper.cxx @@ -57,8 +57,6 @@ public: } -typedef std::set<FieldResult, sortfieldresults> FieldResultSet; - namespace { struct block @@ -66,7 +64,7 @@ struct block sal_Int32 m_nStart; sal_Int32 m_nLen; bool m_bVisible; - FieldResultSet m_aAttrs; + std::set<FieldResult, sortfieldresults> m_aAttrs; block(sal_Int32 nStart, sal_Int32 nLen, bool bVisible) : m_nStart(nStart), m_nLen(nLen), m_bVisible(bVisible) { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 20113a949d18..65cdc272d118 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -279,14 +279,13 @@ public: } -// Row of a HTML table -typedef std::vector<HTMLTableCell> HTMLTableCells; namespace { +// Row of a HTML table class HTMLTableRow { - HTMLTableCells m_aCells; ///< cells of the row + std::vector<HTMLTableCell> m_aCells; ///< cells of the row std::unique_ptr<SvxBrushItem> xBGBrush; // background of cell from STYLE SvxAdjust eAdjust; @@ -378,10 +377,6 @@ public: } // HTML table -typedef std::vector<HTMLTableRow> HTMLTableRows; - -typedef std::vector<HTMLTableColumn> HTMLTableColumns; - typedef std::vector<SdrObject *> SdrObjects; class HTMLTable @@ -394,8 +389,8 @@ class HTMLTable std::unique_ptr<SdrObjects> m_pResizeDrawObjects;// SDR objects std::unique_ptr<std::vector<sal_uInt16>> m_pDrawObjectPercentWidths; // column of draw object and its rel. width - HTMLTableRows m_aRows; ///< table rows - HTMLTableColumns m_aColumns; ///< table columns + std::vector<HTMLTableRow> m_aRows; ///< table rows + std::vector<HTMLTableColumn> m_aColumns; ///< table columns sal_uInt16 m_nRows; // number of rows sal_uInt16 m_nCols; // number of columns |