sc: replace boost::ptr_list with std::list<std::unique_ptr>

Change-Id: I6162cfaacf25db4d1261b67ba99e33c729be86cb

2 files changed, 16 insertions, 16 deletions

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 85ba478923ce..62d128b53d67 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2074,7 +2074,7 @@ ScXMLImport::ScXMLImport(
     pDataStreamAttrTokenMap(NULL),
     mpPostProcessData(NULL),
     aTables(*this),
-    pMyNamedExpressions(NULL),
+    m_pMyNamedExpressions(nullptr),
     pMyLabelRanges(NULL),
     pValidations(NULL),
     pDetectiveOpArray(NULL),
@@ -2223,7 +2223,7 @@ ScXMLImport::~ScXMLImport() throw()
 
     delete pSolarMutexGuard;
 
-    delete pMyNamedExpressions;
+    delete m_pMyNamedExpressions;
     delete pMyLabelRanges;
     delete pValidations;
     delete pDetectiveOpArray;
@@ -2411,7 +2411,7 @@ void ScXMLImport::AddNamedExpression(SCTAB nTab, ScMyNamedExpression* pNamedExp)
         itr = r.first;
     }
     ScMyNamedExpressions& r = *itr->second;
-    o3tl::ptr_container::push_back(r, std::move(p));
+    r.push_back(std::move(p));
 }
 
 ScXMLChangeTrackingImportHelper* ScXMLImport::GetChangeTrackingImportHelper()
@@ -3101,11 +3101,11 @@ public:
     RangeNameInserter(ScDocument* pDoc, ScRangeName& rRangeName, ScXMLImport& rXmlImport) :
         mpDoc(pDoc), mrRangeName(rRangeName), mrXmlImport(rXmlImport) {}
 
-    void operator() (const ScMyNamedExpression& r) const
+    void operator() (const std::unique_ptr<ScMyNamedExpression>& p) const
     {
         using namespace formula;
 
-        const OUString& aType = r.sRangeType;
+        const OUString& aType = p->sRangeType;
         sal_uInt32 nUnoType = ScXMLImport::GetRangeType(aType);
 
         sal_uInt16 nNewType = RT_NAME;
@@ -3120,16 +3120,16 @@ public:
             ScAddress aPos;
             sal_Int32 nOffset = 0;
             bool bSuccess = ScRangeStringConverter::GetAddressFromString(
-                aPos, r.sBaseCellAddress, mpDoc, FormulaGrammar::CONV_OOO, nOffset);
+                aPos, p->sBaseCellAddress, mpDoc, FormulaGrammar::CONV_OOO, nOffset);
 
             if (bSuccess)
             {
-                OUString aContent = r.sContent;
-                if (!r.bIsExpression)
+                OUString aContent = p->sContent;
+                if (!p->bIsExpression)
                     ScXMLConverter::ParseFormula(aContent, false);
 
                 ScRangeData* pData = new ScRangeData(
-                    mpDoc, r.sName, aContent, aPos, nNewType, r.eGrammar);
+                    mpDoc, p->sName, aContent, aPos, nNewType, p->eGrammar);
                 mrRangeName.insert(pData);
             }
         }
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 7ff29c70af15..4b562b864984 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -45,7 +45,7 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
-#include <boost/ptr_container/ptr_list.hpp>
+#include <list>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <boost/noncopyable.hpp>
 
@@ -782,7 +782,7 @@ struct ScMyNamedExpression
     bool               bIsExpression;
 };
 
-typedef ::boost::ptr_list<ScMyNamedExpression> ScMyNamedExpressions;
+typedef ::std::list<std::unique_ptr<ScMyNamedExpression>> ScMyNamedExpressions;
 
 struct ScMyLabelRange
 {
@@ -938,7 +938,7 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable
 
     ScMyTables              aTables;
 
-    ScMyNamedExpressions*   pMyNamedExpressions;
+    ScMyNamedExpressions*   m_pMyNamedExpressions;
     SheetNamedExpMap maSheetNamedExpressions;
 
     ScMyLabelRanges*        pMyLabelRanges;
@@ -1112,12 +1112,12 @@ public:
 
     void AddNamedExpression(ScMyNamedExpression* pMyNamedExpression)
     {
-        if (!pMyNamedExpressions)
-            pMyNamedExpressions = new ScMyNamedExpressions();
-        pMyNamedExpressions->push_back(pMyNamedExpression);
+        if (!m_pMyNamedExpressions)
+            m_pMyNamedExpressions = new ScMyNamedExpressions();
+        m_pMyNamedExpressions->push_back(std::unique_ptr<ScMyNamedExpression>(pMyNamedExpression));
     }
 
-    ScMyNamedExpressions* GetNamedExpressions() { return pMyNamedExpressions; }
+    ScMyNamedExpressions* GetNamedExpressions() { return m_pMyNamedExpressions; }
 
     void AddNamedExpression(SCTAB nTab, ScMyNamedExpression* pNamedExp);