diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-18 14:24:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-19 11:57:57 +0100 |
| commit | a5be07d6b627a18f104e2feed063ff9020e8c610 (patch) | |
| tree | 389ea7a3c163bcafca743373b94cda4fba937552 /sw/source/filter | |
| parent | b0cecbfb03dba67f01d1411a1e8b7402c2ca90ce (diff) | |
inline use-once typedefs
Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157
Reviewed-on: https://gerrit.libreoffice.org/46764
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/inc/msfilter.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/writerhelper.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 2fad70d89c64..ea4ede102581 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -294,7 +294,6 @@ namespace sw { private: std::vector<SwFltStackEntry *> maStack; - typedef std::vector<SwFltStackEntry *>::reverse_iterator myriter; SwDoc &mrDoc; RedlineStack(RedlineStack const&) = delete; @@ -376,7 +375,6 @@ namespace sw }; typedef std::vector<CharRunEntry> CharRuns; - typedef CharRuns::const_iterator cCharRunIter; /** Collect the ranges of Text which share diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index bd255edc0a92..b87573d9bfa4 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -700,7 +700,7 @@ namespace sw bool RedlineStack::close(const SwPosition& rPos, RedlineType_t eType) { //Search from end for same type - myriter aResult = std::find_if(maStack.rbegin(), maStack.rend(), + auto aResult = std::find_if(maStack.rbegin(), maStack.rend(), SameOpenRedlineType(eType)); if (aResult != maStack.rend()) { diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 57a2eb756b14..93f4d392c0d9 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1462,7 +1462,7 @@ private: const SwTextNode& rNd; sw::util::CharRuns maCharRuns; - sw::util::cCharRunIter maCharRunIter; + sw::util::CharRuns::const_iterator maCharRunIter; rtl_TextEncoding meChrSet; sal_uInt16 mnScript; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index c50dd00bc18b..1cf72a50e519 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -6492,7 +6492,7 @@ bool SwWW8ImplReader::InEqualOrHigherApo(int nLvl) const { return false; } - mycApoIter aIter = std::find(m_aApos.begin() + nLvl, m_aApos.end(), true); + auto aIter = std::find(m_aApos.begin() + nLvl, m_aApos.end(), true); return aIter != m_aApos.end(); } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 57a6b4c5355c..089bfc574764 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1188,7 +1188,6 @@ private: //Keep track of APO environments std::deque<bool> m_aApos; - typedef std::deque<bool>::const_iterator mycApoIter; /* Keep track of generated Ruby character formats we can minimize the number of character formats created |