Kaydet (Commit) e10f7dd3 authored tarafından Michael Stahl's avatar Michael Stahl

sc: replace boost::ptr_map with std::map<std::unique_ptr>

Change-Id: I2fbce996afcd7d1dabd7c540272d8877d034cf14
üst 9ec53cce
......@@ -24,6 +24,8 @@
#include <global.hxx>
#include <undoblk.hxx>
#include <o3tl/make_unique.hxx>
#include <memory>
#include <utility>
......@@ -99,11 +101,11 @@ std::unique_ptr<ScSimpleUndo::DataSpansType> DocFuncUtil::getNonEmptyCellSpans(
SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
std::pair<ScSimpleUndo::DataSpansType::iterator,bool> r =
pDataSpans->insert(nTab, new sc::ColumnSpanSet(false));
pDataSpans->insert(std::make_pair(nTab, o3tl::make_unique<sc::ColumnSpanSet>(false)));
if (r.second)
{
sc::ColumnSpanSet* pSet = r.first->second;
sc::ColumnSpanSet *const pSet = r.first->second.get();
pSet->scan(rDoc, nTab, nCol1, nRow1, nCol2, nRow2, true);
}
}
......
......@@ -26,7 +26,8 @@
#include "docsh.hxx"
#include <columnspanset.hxx>
#include <boost/ptr_container/ptr_map.hpp>
#include <memory>
#include <map>
class ScDocument;
class ScDocShell;
......@@ -39,7 +40,7 @@ class ScSimpleUndo: public SfxUndoAction
ScSimpleUndo(const ScSimpleUndo&) = delete;
public:
typedef boost::ptr_map<SCTAB,sc::ColumnSpanSet> DataSpansType;
typedef std::map<SCTAB, std::unique_ptr<sc::ColumnSpanSet>> DataSpansType;
ScSimpleUndo( ScDocShell* pDocSh );
virtual ~ScSimpleUndo();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment