change ScRangeName's container to boost::ptr_map

10 files changed, 36 insertions, 36 deletions

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index c379199ca8c9..427c2d99ed6a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2056,8 +2056,8 @@ void ScPosWnd::FillRangeNames()
             ScRangeName::const_iterator itrBeg = pRangeNames->begin(), itrEnd = pRangeNames->end();
             for (ScRangeName::const_iterator itr = itrBeg; itr != itrEnd; ++itr)
             {
-                if (itr->IsValidReference(aDummy))
-                    aSet.insert(itr->GetName());
+                if (itr->second->IsValidReference(aDummy))
+                    aSet.insert(itr->second->GetName());
             }
         }
         for (SCTAB i = 0; i < pDoc->GetTableCount(); ++i)
@@ -2069,8 +2069,8 @@ void ScPosWnd::FillRangeNames()
                 pDoc->GetName(i, aTableName);
                 for (ScRangeName::const_iterator itr = pLocalRangeName->begin(); itr != pLocalRangeName->end(); ++itr)
                 {
-                    if (itr->IsValidReference(aDummy))
-                        aSet.insert(createLocalRangeName(itr->GetName(), aTableName));
+                    if (itr->second->IsValidReference(aDummy))
+                        aSet.insert(createLocalRangeName(itr->second->GetName(), aTableName));
                 }
             }
         }
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 37d05b63fc79..14b0372cf515 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -176,12 +176,12 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
             sal_uInt16 nInsert = 0;
             for (; itr != itrEnd; ++itr)
             {
-                if (!itr->HasType(RT_CRITERIA))
+                if (!itr->second->HasType(RT_CRITERIA))
                     continue;
 
-                nInsert = aLbFilterArea.InsertEntry(itr->GetName());
+                nInsert = aLbFilterArea.InsertEntry(itr->second->GetName());
                 rtl::OUString aSymbol;
-                itr->GetSymbol(aSymbol);
+                itr->second->GetSymbol(aSymbol);
                 aLbFilterArea.SetEntryData(nInsert, new String(aSymbol));
             }
         }
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 0d8a406d9466..a915eb99f802 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4729,7 +4729,7 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi )
     ScRangeName::iterator itrLocalBeg = pLocalList->begin(), itrLocalEnd = pLocalList->end();
     for (ScRangeName::iterator itr = itrLocalBeg; itr != itrLocalEnd; ++itr)
     {
-        const ScRangeData& r = *itr;
+        const ScRangeData& r = *itr->second;
         if (!r.HasType(RT_DATABASE) && !r.HasType(RT_SHARED))
             ++nValidCount;
     }
@@ -4737,7 +4737,7 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi )
     ScRangeName::iterator itrBeg = pList->begin(), itrEnd = pList->end();
     for (ScRangeName::iterator itr = itrBeg; itr != itrEnd; ++itr)
     {
-        const ScRangeData& r = *itr;
+        const ScRangeData& r = *itr->second;
         if (!r.HasType(RT_DATABASE) && !r.HasType(RT_SHARED) && !pLocalList->findByUpperName(r.GetUpperName()))
             ++nValidCount;
     }
@@ -4766,14 +4766,14 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi )
             sal_uInt16 j = 0;
             for (ScRangeName::iterator itr = itrLocalBeg; itr != itrLocalEnd; ++itr)
             {
-                ScRangeData& r = *itr;
+                ScRangeData& r = *itr->second;
                 if (!r.HasType(RT_DATABASE) && !r.HasType(RT_SHARED))
                     ppSortArray[j++] = &r;
             }
             for (ScRangeName::iterator itr = itrBeg; itr != itrEnd; ++itr)
             {
-                ScRangeData& r = *itr;
-                if (!r.HasType(RT_DATABASE) && !r.HasType(RT_SHARED) && !pLocalList->findByUpperName(r.GetUpperName()))
+                ScRangeData& r = *itr->second;
+                if (!r.HasType(RT_DATABASE) && !r.HasType(RT_SHARED) && !pLocalList->findByUpperName(itr->first))
                     ppSortArray[j++] = &r;
             }
 #ifndef ICC
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index fe43efa7f9d6..b3c168226797 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -247,7 +247,7 @@ void removeRangeNamesBySrcDoc(ScRangeName& rRanges, sal_uInt16 nFileId)
     vector<ScRangeName::iterator> v;
     for (; itr != itrEnd; ++itr)
     {
-        if (hasRefsToSrcDoc(*itr, nFileId))
+        if (hasRefsToSrcDoc(*itr->second, nFileId))
             v.push_back(itr);
     }
     for_each(v.begin(), v.end(), EraseRangeByIterator(rRanges));
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 28adc44a21db..f2b03b11509d 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -131,10 +131,10 @@ void ScRangeManagerTable::Init(const boost::ptr_map<rtl::OUString, ScRangeName>&
         for (ScRangeName::const_iterator it = pLocalRangeName->begin();
                 it != pLocalRangeName->end(); ++it)
         {
-            if (!it->HasType(RT_DATABASE) && !it->HasType(RT_SHARED))
+            if (!it->second->HasType(RT_DATABASE) && !it->second->HasType(RT_SHARED))
             {
-                aLine.aName = it->GetName();
-                it->GetSymbol(aLine.aExpression);
+                aLine.aName = it->second->GetName();
+                it->second->GetSymbol(aLine.aExpression);
                 addEntry(aLine);
             }
         }
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 00904026c6b2..cb3b68cc7d8d 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -683,8 +683,8 @@ void ScContentTree::GetAreaNames()
         ScRangeName::const_iterator itrBeg = pRangeNames->begin(), itrEnd = pRangeNames->end();
         for (ScRangeName::const_iterator itr = itrBeg; itr != itrEnd; ++itr)
         {
-            if (itr->IsValidReference(aDummy))
-                aSet.insert(itr->GetName());
+            if (itr->second->IsValidReference(aDummy))
+                aSet.insert(itr->second->GetName());
         }
     }
     for (SCTAB i = 0; i < pDoc->GetTableCount(); ++i)
@@ -696,8 +696,8 @@ void ScContentTree::GetAreaNames()
             pDoc->GetName(i, aTableName);
             for (ScRangeName::const_iterator itr = pLocalRangeName->begin(); itr != pLocalRangeName->end(); ++itr)
             {
-                if (itr->IsValidReference(aDummy))
-                    aSet.insert(createLocalRangeName(itr->GetName(), aTableName));
+                if (itr->second->IsValidReference(aDummy))
+                    aSet.insert(createLocalRangeName(itr->second->GetName(), aTableName));
             }
         }
     }
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index b239d525acb9..6968699d3ffc 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -484,15 +484,15 @@ void ScPrintAreasDlg::Impl_FillLists()
     ScRangeName::const_iterator itr = pRangeNames->begin(), itrEnd = pRangeNames->end();
     for (; itr != itrEnd; ++itr)
     {
-        if (!itr->HasType(RT_ABSAREA) && !itr->HasType(RT_REFAREA) && !itr->HasType(RT_ABSPOS))
+        if (!itr->second->HasType(RT_ABSAREA) && !itr->second->HasType(RT_REFAREA) && !itr->second->HasType(RT_ABSPOS))
             continue;
 
-        OUString aName = itr->GetName();
+        OUString aName = itr->second->GetName();
         OUString aSymbol;
-        itr->GetSymbol(aSymbol);
+        itr->second->GetSymbol(aSymbol);
         if (aRange.ParseAny(aSymbol, pDoc, eConv) & SCA_VALID)
         {
-            if (itr->HasType(RT_PRINTAREA))
+            if (itr->second->HasType(RT_PRINTAREA))
             {
                 aRange.Format(aSymbol, SCR_ABS, pDoc, eConv);
                 aLbPrintArea.SetEntryData(
@@ -500,7 +500,7 @@ void ScPrintAreasDlg::Impl_FillLists()
                     new String(aSymbol) );
             }
 
-            if (itr->HasType(RT_ROWHEADER))
+            if (itr->second->HasType(RT_ROWHEADER))
             {
                 lcl_GetRepeatRangeString(&aRange, pDoc, true, aSymbol);
                 aLbRepeatRow.SetEntryData(
@@ -508,7 +508,7 @@ void ScPrintAreasDlg::Impl_FillLists()
                     new String(aSymbol) );
             }
 
-            if (itr->HasType(RT_COLHEADER))
+            if (itr->second->HasType(RT_COLHEADER))
             {
                 lcl_GetRepeatRangeString(&aRange, pDoc, false, aSymbol);
                 aLbRepeatCol.SetEntryData(
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 3210c8143978..7de71d1c5975 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -667,7 +667,7 @@ sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException)
         {
             ScRangeName::const_iterator itr = pNames->begin(), itrEnd = pNames->end();
             for (; itr != itrEnd; ++itr)
-                if (lcl_UserVisibleName(*itr))
+                if (lcl_UserVisibleName(*itr->second))
                     ++nRet;
         }
     }
@@ -761,8 +761,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames()
             ScRangeName::const_iterator itr = pNames->begin(), itrEnd = pNames->end();
             for (; itr != itrEnd; ++itr)
             {
-                if (lcl_UserVisibleName(*itr))
-                    pAry[nVisPos++] = itr->GetName();
+                if (lcl_UserVisibleName(*itr->second))
+                    pAry[nVisPos++] = itr->second->GetName();
             }
             return aSeq;
         }
@@ -894,10 +894,10 @@ ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex
     sal_uInt16 nPos = 0;
     for (; itr != itrEnd; ++itr)
     {
-        if (lcl_UserVisibleName(*itr))
+        if (lcl_UserVisibleName(*itr->second))
         {
             if (nPos == nIndex)
-                return new ScNamedRangeObj(this, pDocShell, itr->GetName());
+                return new ScNamedRangeObj(this, pDocShell, itr->second->GetName());
         }
         ++nPos;
     }
@@ -961,10 +961,10 @@ ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByIndex_Impl( sal_uInt16 nIndex
     sal_uInt16 nPos = 0;
     for (; itr != itrEnd; ++itr)
     {
-        if (lcl_UserVisibleName(*itr))
+        if (lcl_UserVisibleName(*itr->second))
         {
             if (nPos == nIndex)
-                return new ScNamedRangeObj(this, pDocShell, itr->GetName(), mxSheet);
+                return new ScNamedRangeObj(this, pDocShell, itr->second->GetName(), mxSheet);
         }
         ++nPos;
     }
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index f84f5b48a75c..f969b8f1d10c 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -6125,9 +6125,9 @@ uno::Any SAL_CALL ScVbaRange::AdvancedFilter( sal_Int32 Action, const uno::Any&
             ScRangeName::const_iterator itr = pRangeNames->begin(), itrEnd = pRangeNames->end();
             for (; itr != itrEnd; ++itr)
             {
-                if (itr->HasType(RT_CRITERIA))
+                if (itr->second->HasType(RT_CRITERIA))
                 {
-                    itr->GetSymbol( aBuiltInCriteria, formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
+                    itr->second->GetSymbol( aBuiltInCriteria, formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
                     break;
                 }
             }
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index fd86dbe14375..03738a994493 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2218,7 +2218,7 @@ void ScCellShell::ExecuteDataPilotDialog()
         {
             ScRangeName::const_iterator itr = pRangeName->begin(), itrEnd = pRangeName->end();
             for (; itr != itrEnd; ++itr)
-                pTypeDlg->AppendNamedRange(itr->GetName());
+                pTypeDlg->AppendNamedRange(itr->second->GetName());
         }
 
         OSL_ENSURE(pTypeDlg, "Dialog create fail!");