diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-12 09:39:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 10:45:04 +0200 |
| commit | e666bd8e6d00dadbea74b96a8be8ec830ec92c46 (patch) | |
| tree | 7c864fd096036527f6ba5afba5dcc07d0f7b4275 /sc/source/ui | |
| parent | 8733b2ab2480cddf96a694ee3fe12703e402a51f (diff) | |
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I1e1d27b2e7262cda230f193a867d288220dc0ec6
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/PivotLayoutDialog.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/PivotLayoutTreeListData.hxx | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx index 7623ed36eb65..9bee06659614 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx @@ -137,7 +137,7 @@ void ScPivotLayoutTreeListData::FillDataField(ScPivotFieldVector& rDataFields) pItemValue->maName, pItemValue->maFunctionData.mnDupCount); - maDataItemValues.push_back(pItemValue); + maDataItemValues.push_back(std::unique_ptr<ScItemValue>(pItemValue)); InsertEntry(sDataItemName, nullptr, false, TREELIST_APPEND, pItemValue); } } @@ -193,7 +193,7 @@ void ScPivotLayoutTreeListData::InsertEntryForItem(ScItemValue* pItemValue, sal_ { ScItemValue* pDataItemValue = new ScItemValue(pItemValue); pDataItemValue->mpOriginalItemValue = pItemValue; - maDataItemValues.push_back(pDataItemValue); + maDataItemValues.push_back(std::unique_ptr<ScItemValue>(pDataItemValue)); ScPivotFuncData& rFunctionData = pDataItemValue->maFunctionData; diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index da95ea9bcac4..df4e901afee6 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -11,8 +11,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTDIALOG_HXX #define INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTDIALOG_HXX -#include <boost/ptr_container/ptr_vector.hpp> - #include <svx/checklbx.hxx> #include <vcl/lstbox.hxx> #include "anyrefdg.hxx" diff --git a/sc/source/ui/inc/PivotLayoutTreeListData.hxx b/sc/source/ui/inc/PivotLayoutTreeListData.hxx index 73c6f0c0cb7c..331967f923fc 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListData.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListData.hxx @@ -12,12 +12,13 @@ #define INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTTREELISTDATA_HXX #include "PivotLayoutTreeListBase.hxx" -#include <boost/ptr_container/ptr_vector.hpp> +#include <vector> +#include <memory> class ScPivotLayoutTreeListData : public ScPivotLayoutTreeListBase { private: - boost::ptr_vector<ScItemValue> maDataItemValues; + std::vector<std::unique_ptr<ScItemValue> > maDataItemValues; public: ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits); |