4 files changed, 3 insertions, 4 deletions
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