diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-06-27 00:54:32 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-27 08:38:50 +0200 |
| commit | 38b14b248029ea65fc778ede06e8b426b74451da (patch) | |
| tree | 798f9e4b1789b4cacc147ef5f66507047d028b54 /sw | |
| parent | f1d9aca4bf596c0a3be44483b1d60867f12683ec (diff) | |
tdf#96099 Remove some trivial std::deque typedefs
Change-Id: I101c8a39344ab007640aec9ddad6f82d4fe64296
Reviewed-on: https://gerrit.libreoffice.org/56504
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unoportenum.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 85877cbdf81d..208e708ccf90 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -396,10 +396,8 @@ uno::Any SwXTextPortionEnumeration::nextElement() return any; } -typedef std::deque< sal_Int32 > FieldMarks_t; - static void -lcl_FillFieldMarkArray(FieldMarks_t & rFieldMarks, SwUnoCursor const & rUnoCursor, +lcl_FillFieldMarkArray(std::deque<sal_Int32> & rFieldMarks, SwUnoCursor const & rUnoCursor, const sal_Int32 i_nStartPos) { const SwTextNode * const pTextNode = @@ -1316,7 +1314,7 @@ static void lcl_CreatePortions( SwDoc * const pDoc = pUnoCursor->GetDoc(); - FieldMarks_t FieldMarks; + std::deque<sal_Int32> FieldMarks; lcl_FillFieldMarkArray(FieldMarks, *pUnoCursor, i_nStartPos); SwXBookmarkPortion_ImplList Bookmarks; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index c22b79841e0a..289303da11c1 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -817,7 +817,6 @@ private: SwWW8ImplReader& mrReader; std::deque<wwSection> maSegments; typedef std::deque<wwSection>::iterator mySegIter; - typedef std::deque<wwSection>::reverse_iterator mySegrIter; //Num of page desc's entered into the document sal_uInt16 mnDesc; diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 227fe8937a0f..2f81599eb5b6 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -635,8 +635,8 @@ SwSectionFormat *wwSectionManager::InsertSection( return nullptr; SwPageDesc *pPage = nullptr; - mySegrIter aEnd = maSegments.rend(); - for (mySegrIter aIter = maSegments.rbegin(); aIter != aEnd; ++aIter) + auto aEnd = maSegments.rend(); + for (auto aIter = maSegments.rbegin(); aIter != aEnd; ++aIter) { if (nullptr != (pPage = aIter->mpPage)) break; |