diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-19 12:25:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-08-19 19:32:18 +0200 |
| commit | 37039980981355fc65c5b871d07b336486baa7d6 (patch) | |
| tree | 9ce80c0dae33986000eb772d791b88ae2ccfa8da | |
| parent | 086fe6f1e87c575ad5480c4ee9676aa2af6d489d (diff) | |
sc: these are ptr_map not ptr_set
Change-Id: I55848b3fedae79d714c8341fd84d505cb83a7c2c
| -rw-r--r-- | sc/inc/rangenam.hxx | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/rangenam.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/sheetdatabuffer.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/namedlg.hxx | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 53e244978f09..5d01b3163743 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -28,7 +28,6 @@ #include <map> #include <vector> -#include <boost/ptr_container/ptr_set.hpp> #include <boost/ptr_container/ptr_map.hpp> class ScDocument; @@ -211,7 +210,7 @@ public: bool empty() const; /** 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 this insert here returns false the object where p pointed to is gone! */ diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index c021dc24b609..ebad87338d13 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -680,7 +680,7 @@ ScRangeName::ScRangeName() {} ScRangeName::ScRangeName(const ScRangeName& r) : 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. maIndexToData.resize( r.maIndexToData.size(), NULL); DataType::const_iterator itr = maData.begin(), itrEnd = maData.end(); diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 35832b25aa6b..c703bb641d52 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -22,6 +22,8 @@ #include <list> #include <map> +#include <set> + #include "richstring.hxx" #include "worksheethelper.hxx" diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index aa4b8c45e9f6..5b6edb18fec1 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -31,7 +31,6 @@ #include "namemgrtable.hxx" #include <boost/ptr_container/ptr_map.hpp> -#include <boost/ptr_container/ptr_set.hpp> #include <stack> #include <map> |