diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-02 18:38:48 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-02 21:11:43 +0100 |
| commit | f462cd39b990929bc71615f7f04d561d64c1039d (patch) | |
| tree | f3a713fe4746846ccb4e2fe3ce3fc6c86d03e2f5 /sc/inc | |
| parent | 9939a89c1e39e5c350600b6bea795743ddb780fb (diff) | |
sc: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I51d87693bdb3d57c36d8cafb851fdad10cd93589
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/document.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/undorangename.hxx | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index ec019b098c64..83f12bc53912 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -528,7 +528,7 @@ public: * non-empty range name set. */ SC_DLLPUBLIC void GetAllTabRangeNames(ScRangeName::TabNameCopyMap& rRangeNames) const; - SC_DLLPUBLIC void SetAllRangeNames( const boost::ptr_map<OUString, ScRangeName>& rRangeMap); + SC_DLLPUBLIC void SetAllRangeNames(const std::map<OUString, std::unique_ptr<ScRangeName>>& rRangeMap); SC_DLLPUBLIC void GetTabRangeNameMap(std::map<OUString, ScRangeName*>& rRangeName); SC_DLLPUBLIC void GetRangeNameMap(std::map<OUString, ScRangeName*>& rRangeName); SC_DLLPUBLIC ScRangeName* GetRangeName(SCTAB nTab) const; diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx index ba5a93538f29..009c2a13c63f 100644 --- a/sc/inc/undorangename.hxx +++ b/sc/inc/undorangename.hxx @@ -12,7 +12,9 @@ #include "undobase.hxx" #include "rangenam.hxx" -#include <boost/ptr_container/ptr_map.hpp> + +#include <memory> +#include <map> class ScDocShell; @@ -23,8 +25,8 @@ class ScUndoAllRangeNames : public ScSimpleUndo { public: ScUndoAllRangeNames(ScDocShell* pDocSh, - const std::map<OUString, ScRangeName*>& rOldNames, - const boost::ptr_map<OUString, ScRangeName>& rNewNames); + const std::map<OUString, ScRangeName*>& rOldNames, + const std::map<OUString, std::unique_ptr<ScRangeName>>& rNewNames); virtual ~ScUndoAllRangeNames(); @@ -35,11 +37,11 @@ public: virtual OUString GetComment() const override; private: - void DoChange(const boost::ptr_map<OUString, ScRangeName>& rNames); + void DoChange(const std::map<OUString, std::unique_ptr<ScRangeName>>& rNames); private: - boost::ptr_map<OUString, ScRangeName> maOldNames; - boost::ptr_map<OUString, ScRangeName> maNewNames; + std::map<OUString, std::unique_ptr<ScRangeName>> m_OldNames; + std::map<OUString, std::unique_ptr<ScRangeName>> m_NewNames; }; class ScUndoAddRangeData : public ScSimpleUndo |