diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-07 00:20:26 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-09 12:04:12 +0100 |
| commit | 8e36027e2768b4d9d7c8beff864a557c450184ca (patch) | |
| tree | f4828d0198b193033c5cd6935c9e3e76f8d58abc /sc/inc | |
| parent | a3e410a043f42e70836ca564a5cccdd12664b457 (diff) | |
sc: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: Id80f6d6be9f5cb15448ea00299b8e371ccd812ee
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/colorscale.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 43a19982981d..a8d9f1f5f225 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_SC_INC_COLORSCALE_HXX #define INCLUDED_SC_INC_COLORSCALE_HXX -#include <boost/ptr_container/ptr_vector.hpp> #include <formula/grammar.hxx> #include <tools/color.hxx> #include "rangelst.hxx" @@ -334,7 +333,8 @@ struct ScIconSetFormatData * Specifies whether the icons should be shown in reverse order */ bool mbReverse; - boost::ptr_vector<ScColorScaleEntry> maEntries; + typedef std::vector<std::unique_ptr<ScColorScaleEntry>> Entries_t; + Entries_t m_Entries; bool mbCustom; // the std::pair points to exactly one image // std..pair::second == -1 means no image @@ -346,6 +346,9 @@ struct ScIconSetFormatData mbReverse(false), mbCustom(false) {} + + ScIconSetFormatData(ScIconSetFormatData const&); + ScIconSetFormatData& operator=(ScIconSetFormatData const&) = delete; //TODO? }; class SC_DLLPUBLIC ScIconSetFormat : public ScColorFormat @@ -374,8 +377,8 @@ public: static ScIconSetMap* getIconSetMap(); static BitmapEx& getBitmap( ScIconSetType eType, sal_Int32 nIndex ); - typedef boost::ptr_vector<ScColorScaleEntry>::iterator iterator; - typedef boost::ptr_vector<ScColorScaleEntry>::const_iterator const_iterator; + typedef ScIconSetFormatData::Entries_t::iterator iterator; + typedef ScIconSetFormatData::Entries_t::const_iterator const_iterator; iterator begin(); const_iterator begin() const; |