From e666bd8e6d00dadbea74b96a8be8ec830ec92c46 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 12 Nov 2015 09:39:59 +0200 Subject: sc: boost::ptr_vector->std::vector Change-Id: I1e1d27b2e7262cda230f193a867d288220dc0ec6 --- sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 4 ++-- sc/source/ui/inc/PivotLayoutDialog.hxx | 2 -- sc/source/ui/inc/PivotLayoutTreeListData.hxx | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'sc/source/ui') 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(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(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 - #include #include #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 +#include +#include class ScPivotLayoutTreeListData : public ScPivotLayoutTreeListBase { private: - boost::ptr_vector maDataItemValues; + std::vector > maDataItemValues; public: ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits); -- cgit