diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-18 10:12:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-18 10:38:08 +0000 |
| commit | 53f16c39f5c4c69ab603bf9098daec71f7a0acb8 (patch) | |
| tree | 00b3166ecff36bb55dcf0b8c2122a08b72656ab5 /sw | |
| parent | 4c1f958634ae88614a794bf232c67e9e785bf703 (diff) | |
remove unused typedefs and inline use-once typedefs
and improve the script a little
Change-Id: I2792ea4dd5df3a50736fbe209225c3f16fb86b84
Reviewed-on: https://gerrit.libreoffice.org/20033
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbatablesofcontents.cxx | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 78d5875889ac..d9eb62718755 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1251,14 +1251,12 @@ public: } }; -// Plc for Chpx and Papx ( incl PN-Plc ) -typedef std::vector<std::unique_ptr<WW8_WrFkp>> WW8_WrFkpPtrs; - class WW8_WrPlcPn // Plc for Page Numbers { private: WW8Export& rWrt; - WW8_WrFkpPtrs m_Fkps; + // Plc for Chpx and Papx ( incl PN-Plc ) + std::vector<std::unique_ptr<WW8_WrFkp>> m_Fkps; sal_uInt16 nFkpStartPage; ePLCFT ePlc; diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 3861e6ccee56..daaeee6fd16f 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -88,8 +88,6 @@ public: {} }; -typedef std::vector<std::unique_ptr<WW8SelBoxInfo>> WW8MergeGroups; - WW8TabBandDesc::WW8TabBandDesc() { memset(this, 0, sizeof(*this)); @@ -122,7 +120,7 @@ class WW8TabDesc: private boost::noncopyable SwTableBoxes* pTabBoxes; // boxes array in current row SwTableBox* pTabBox; // current cell - WW8MergeGroups m_MergeGroups; // list of all cells to be merged + std::vector<std::unique_ptr<WW8SelBoxInfo>> m_MergeGroups; // list of all cells to be merged WW8_TCell* pAktWWCell; diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 37877a3f3460..6999b04b063d 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -25,8 +25,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -typedef std::vector< uno::Reference< text::XDocumentIndex > > XTocVec; - class TablesOfContentsEnumWrapper : public EnumerationHelper_BASE { uno::Reference< container::XIndexAccess > mxIndexAccess; @@ -58,7 +56,7 @@ private: uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; uno::Reference< text::XTextDocument > mxTextDocument; - XTocVec maToc; + std::vector< uno::Reference< text::XDocumentIndex > > maToc; public: TableOfContentsCollectionHelper( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ) throw ( uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxTextDocument( xDoc ) |