diff options
| -rw-r--r-- | sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/inc/PivotLayoutTreeListLabel.hxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx index 5efd63f53b73..d4f98ab2b69f 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx @@ -43,7 +43,7 @@ void ScPivotLayoutTreeListLabel::FillLabelFields(ScDPLabelDataVector& rLabelVect const ScDPLabelData& rLabelData = *it; ScItemValue* pValue = new ScItemValue(rLabelData.maName, rLabelData.mnCol, rLabelData.mnFuncMask); - maItemValues.push_back(pValue); + maItemValues.push_back(std::unique_ptr<ScItemValue>(pValue)); if (rLabelData.mbDataLayout) { maDataItem = maItemValues.size() - 1; @@ -71,8 +71,8 @@ bool ScPivotLayoutTreeListLabel::IsDataElement(SCCOL nColumn) ScItemValue* ScPivotLayoutTreeListLabel::GetItem(SCCOL nColumn) { if (nColumn == PIVOT_DATA_FIELD) - return &maItemValues[maDataItem]; - return &maItemValues[nColumn]; + return maItemValues[maDataItem].get(); + return maItemValues[nColumn].get(); } void ScPivotLayoutTreeListLabel::KeyInput(const KeyEvent& rKeyEvent) diff --git a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx index 08de8d261228..03f42ea50532 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx @@ -12,12 +12,13 @@ #define INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTTREELISTLABEL_HXX #include "PivotLayoutTreeListBase.hxx" -#include <boost/ptr_container/ptr_vector.hpp> +#include <vector> +#include <memory> class ScPivotLayoutTreeListLabel : public ScPivotLayoutTreeListBase { private: - boost::ptr_vector<ScItemValue> maItemValues; + std::vector<std::unique_ptr<ScItemValue> > maItemValues; SCCOL maDataItem; public: |