diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index f7217d567e87..d51aa85a1008 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -234,13 +234,11 @@ public:
     void CopyUsedNames( const SCTAB nLocalTab, const SCTAB nOldTab, const SCTAB nNewTab,
             const ScDocument& rOldDoc, ScDocument& rNewDoc, const bool bGlobalNamesToLocal ) const;
 
-    SC_DLLPUBLIC const_iterator begin() const;
-    SC_DLLPUBLIC const_iterator end() const;
-    SC_DLLPUBLIC iterator begin();
-    SC_DLLPUBLIC iterator end();
-    SC_DLLPUBLIC size_t size() const;
-    SC_DLLPUBLIC size_t index_size() const;
-    bool empty() const;
+    SC_DLLPUBLIC const_iterator begin() const { return m_Data.begin(); }
+    SC_DLLPUBLIC const_iterator end() const  { return m_Data.end(); }
+    SC_DLLPUBLIC size_t size() const { return m_Data.size(); }
+    SC_DLLPUBLIC size_t index_size() const { return maIndexToData.size(); }
+    bool empty() const { return m_Data.empty(); }
 
     /** Insert object into set.
         @ATTENTION: The underlying ::std::map<std::unique_ptr>::insert(p) takes
@@ -264,7 +262,8 @@ public:
      * iterator's validity.  The caller must make sure that the iterator is
      * valid.
      */
-    void erase(const iterator& itr);
+    void erase(const_iterator itr);
+
     void clear();
     bool operator== (const ScRangeName& r) const;
 };
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 11e177158148..09bef58a1bd4 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -778,41 +778,6 @@ void ScRangeName::CopyUsedNames( const SCTAB nLocalTab, const SCTAB nOldTab, con
     }
 }
 
-ScRangeName::const_iterator ScRangeName::begin() const
-{
-    return m_Data.begin();
-}
-
-ScRangeName::const_iterator ScRangeName::end() const
-{
-    return m_Data.end();
-}
-
-ScRangeName::iterator ScRangeName::begin()
-{
-    return m_Data.begin();
-}
-
-ScRangeName::iterator ScRangeName::end()
-{
-    return m_Data.end();
-}
-
-size_t ScRangeName::size() const
-{
-    return m_Data.size();
-}
-
-size_t ScRangeName::index_size() const
-{
-    return maIndexToData.size();
-}
-
-bool ScRangeName::empty() const
-{
-    return m_Data.empty();
-}
-
 bool ScRangeName::insert( ScRangeData* p, bool bReuseFreeIndex )
 {
     if (!p)
@@ -863,12 +828,12 @@ void ScRangeName::erase(const ScRangeData& r)
 
 void ScRangeName::erase(const OUString& rName)
 {
-    DataType::iterator itr = m_Data.find(rName);
+    DataType::const_iterator itr = m_Data.find(rName);
     if (itr != m_Data.end())
         erase(itr);
 }
 
-void ScRangeName::erase(const iterator& itr)
+void ScRangeName::erase(const_iterator itr)
 {
     sal_uInt16 nIndex = itr->second->GetIndex();
     m_Data.erase(itr);
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 1fac22e41861..c25a79f1f919 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -222,7 +222,7 @@ class EraseRangeByIterator
     ScRangeName& mrRanges;
 public:
     explicit EraseRangeByIterator(ScRangeName& rRanges) : mrRanges(rRanges) {}
-    void operator() (const ScRangeName::iterator& itr)
+    void operator() (const ScRangeName::const_iterator& itr)
     {
         mrRanges.erase(itr);
     }
@@ -234,8 +234,8 @@ public:
  */
 void removeRangeNamesBySrcDoc(ScRangeName& rRanges, sal_uInt16 nFileId)
 {
-    ScRangeName::iterator itr = rRanges.begin(), itrEnd = rRanges.end();
-    vector<ScRangeName::iterator> v;
+    ScRangeName::const_iterator itr = rRanges.begin(), itrEnd = rRanges.end();
+    vector<ScRangeName::const_iterator> v;
     for (; itr != itrEnd; ++itr)
     {
         if (hasRefsToSrcDoc(*itr->second, nFileId))