summaryrefslogtreecommitdiff
path: root/sc/source/filter/xml/xmlimprt.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-11-09 13:19:03 +0100
committerMichael Stahl <mstahl@redhat.com>2015-11-09 17:12:20 +0100
commit1f0c3a16321ca0d63e09b733170b0375cf2d4ee3 (patch)
tree736cdd7fe3243f004285cf1bf260446db94c533a /sc/source/filter/xml/xmlimprt.hxx
parentdf6d3e9d91c25bd1ef7c7cba0f1af63895890411 (diff)
sc: replace boost::ptr_list with std::list<std::unique_ptr>
Change-Id: I6162cfaacf25db4d1261b67ba99e33c729be86cb
Diffstat (limited to 'sc/source/filter/xml/xmlimprt.hxx')
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx14
1 files changed, 7 insertions, 7 deletions
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);