diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2017-02-12 09:48:38 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2017-02-17 22:41:03 +0000 |
| commit | e75734dfc530a101cadfe263fc256b12acc3a718 (patch) | |
| tree | 851abcce9a2f6a04f860ab8487910556b7fcd6e5 /sc/source/ui/dbgui/PivotLayoutDialog.cxx | |
| parent | 1334702ec3c92484c70954ce8474882ae5da6764 (diff) | |
Pivot dialog: use C++11 feat., get rid of using namespace std
Change-Id: Ic3690bf94aac2ec69c074eb4707a765bd932e5b0
Reviewed-on: https://gerrit.libreoffice.org/34173
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sc/source/ui/dbgui/PivotLayoutDialog.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/PivotLayoutDialog.cxx | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 5503c5e1d52d..0e0ed4b144bf 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -571,32 +571,27 @@ void ScPivotLayoutDialog::ApplySaveData(ScDPSaveData& rSaveData) void ScPivotLayoutDialog::ApplyLabelData(ScDPSaveData& rSaveData) { - ScDPLabelDataVector::const_iterator it; ScDPLabelDataVector& rLabelDataVector = GetLabelDataVector(); - for (it = rLabelDataVector.begin(); it != rLabelDataVector.end(); ++it) + for (std::unique_ptr<ScDPLabelData> const & pLabelData : rLabelDataVector) { - const ScDPLabelData& rLabelData = *it->get(); - - OUString aUnoName = ScDPUtil::createDuplicateDimensionName(rLabelData.maName, rLabelData.mnDupCount); + OUString aUnoName = ScDPUtil::createDuplicateDimensionName(pLabelData->maName, pLabelData->mnDupCount); ScDPSaveDimension* pSaveDimensions = rSaveData.GetExistingDimensionByName(aUnoName); if (pSaveDimensions == nullptr) continue; - pSaveDimensions->SetUsedHierarchy(rLabelData.mnUsedHier); - pSaveDimensions->SetShowEmpty(rLabelData.mbShowAll); - pSaveDimensions->SetRepeatItemLabels(rLabelData.mbRepeatItemLabels); - pSaveDimensions->SetSortInfo(&rLabelData.maSortInfo); - pSaveDimensions->SetLayoutInfo(&rLabelData.maLayoutInfo); - pSaveDimensions->SetAutoShowInfo(&rLabelData.maShowInfo); + pSaveDimensions->SetUsedHierarchy(pLabelData->mnUsedHier); + pSaveDimensions->SetShowEmpty(pLabelData->mbShowAll); + pSaveDimensions->SetRepeatItemLabels(pLabelData->mbRepeatItemLabels); + pSaveDimensions->SetSortInfo(&pLabelData->maSortInfo); + pSaveDimensions->SetLayoutInfo(&pLabelData->maLayoutInfo); + pSaveDimensions->SetAutoShowInfo(&pLabelData->maShowInfo); - bool bManualSort = (rLabelData.maSortInfo.Mode == DataPilotFieldSortMode::MANUAL); + bool bManualSort = (pLabelData->maSortInfo.Mode == DataPilotFieldSortMode::MANUAL); - std::vector<ScDPLabelData::Member>::const_iterator itMember; - for (itMember = rLabelData.maMembers.begin(); itMember != rLabelData.maMembers.end(); ++itMember) + for (ScDPLabelData::Member const & rLabelMember : pLabelData->maMembers) { - const ScDPLabelData::Member& rLabelMember = *itMember; ScDPSaveMember* pMember = pSaveDimensions->GetMemberByName(rLabelMember.maName); if (bManualSort || !rLabelMember.mbVisible || !rLabelMember.mbShowDetails) |