8 files changed, 5 insertions, 11 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index f5e6f551e8c9..7f01f6ff09d6 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -72,7 +72,6 @@ namespace i18nutil { struct SearchOptions2; }
 #define COL_NOTES_SIDEPANE_ARROW_DISABLED   RGB_COLORDATA(172,168,153)
 
 typedef std::list<SwSidebarItem*> SwSidebarItem_list;
-typedef std::list<SwSidebarItem*>::iterator SwSidebarItem_iterator;
 
 struct SwPostItPageItem
 {
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
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index c204998f35a0..e03e43a2994e 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -43,9 +43,7 @@ using namespace ::std;
 
 struct SwCompatibilityOptPage_Impl
 {
-    typedef vector< SvtCompatibilityEntry > SwCompatibilityItemList;
-
-    SwCompatibilityItemList m_aList;
+    std::vector< SvtCompatibilityEntry > m_aList;
 };
 
 SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index f7571ffb0398..0b982a5b8945 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -934,7 +934,7 @@ bool SwPostItMgr::BorderOverPageBorder(unsigned long aPage) const
         return false;
     }
 
-    SwSidebarItem_iterator aItem = mPages[aPage-1]->mList->end();
+    auto aItem = mPages[aPage-1]->mList->end();
     --aItem;
     OSL_ENSURE ((*aItem)->pPostIt,"BorderOverPageBorder: NULL postIt, should never happen");
     if ((*aItem)->pPostIt)