diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-13 10:30:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-13 10:54:20 +0200 |
| commit | 343ec4b7234f4eb9709f09d453131100d3283ddc (patch) | |
| tree | be2bb9566746b026b2bae1a4cfc6fc69e3f21641 /sc/source/core/data/dpobject.cxx | |
| parent | 280553e30f4ddc932838f98a9efaac03a988a0df (diff) | |
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I21fdb9f503241c2fa38f3de059a1f674a6631c78
Diffstat (limited to 'sc/source/core/data/dpobject.cxx')
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index c1fcdfc0c5ec..ed1c7d45b3d8 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2385,9 +2385,9 @@ bool ScDPObject::FillLabelData(ScPivotParam& rParam) for (sal_Int32 nDim = 0; nDim < nDimCount; ++nDim) { - std::unique_ptr<ScDPLabelData> pNewLabel(new ScDPLabelData); + ScDPLabelData* pNewLabel = new ScDPLabelData; FillLabelDataForDimension(xDims, nDim, *pNewLabel); - o3tl::ptr_container::push_back(rParam.maLabelArray, std::move(pNewLabel)); + rParam.maLabelArray.push_back(std::unique_ptr<ScDPLabelData>(pNewLabel)); } return true; @@ -2625,7 +2625,7 @@ void ScDPObject::ConvertOrientation( pDim->RemoveSubtotalName(); if (nDimIndex < rLabels.size()) { - const ScDPLabelData& rLabel = rLabels[nDimIndex]; + const ScDPLabelData& rLabel = *rLabels[nDimIndex].get(); if (!rLabel.maLayoutName.isEmpty()) pDim->SetLayoutName(rLabel.maLayoutName); if (!rLabel.maSubtotalName.isEmpty()) |