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

sc: these are ptr_map not ptr_set

Change-Id: I55848b3fedae79d714c8341fd84d505cb83a7c2c
üst 086fe6f1
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <boost/ptr_container/ptr_set.hpp>
#include <boost/ptr_container/ptr_map.hpp> #include <boost/ptr_container/ptr_map.hpp>
class ScDocument; class ScDocument;
...@@ -211,7 +210,7 @@ public: ...@@ -211,7 +210,7 @@ public:
bool empty() const; bool empty() const;
/** Insert object into set. /** Insert object into set.
@ATTENTION: The underlying ::boost::ptr_set_adapter::insert(p) takes @ATTENTION: The underlying ::boost::ptr_map_adapter::insert(p) takes
ownership of p and if it can't insert it deletes the object! So, if ownership of p and if it can't insert it deletes the object! So, if
this insert here returns false the object where p pointed to is gone! this insert here returns false the object where p pointed to is gone!
*/ */
......
...@@ -680,7 +680,7 @@ ScRangeName::ScRangeName() {} ...@@ -680,7 +680,7 @@ ScRangeName::ScRangeName() {}
ScRangeName::ScRangeName(const ScRangeName& r) : ScRangeName::ScRangeName(const ScRangeName& r) :
maData(r.maData) maData(r.maData)
{ {
// boost::ptr_set clones and deletes, so each collection needs its own // boost::ptr_map clones and deletes, so each collection needs its own
// index to data. // index to data.
maIndexToData.resize( r.maIndexToData.size(), NULL); maIndexToData.resize( r.maIndexToData.size(), NULL);
DataType::const_iterator itr = maData.begin(), itrEnd = maData.end(); DataType::const_iterator itr = maData.begin(), itrEnd = maData.end();
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include <list> #include <list>
#include <map> #include <map>
#include <set>
#include "richstring.hxx" #include "richstring.hxx"
#include "worksheethelper.hxx" #include "worksheethelper.hxx"
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "namemgrtable.hxx" #include "namemgrtable.hxx"
#include <boost/ptr_container/ptr_map.hpp> #include <boost/ptr_container/ptr_map.hpp>
#include <boost/ptr_container/ptr_set.hpp>
#include <stack> #include <stack>
#include <map> #include <map>
......
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