diff options
Diffstat (limited to 'sc/source/core/data/dptabres.cxx')
| -rw-r--r-- | sc/source/core/data/dptabres.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index db117a13f638..6e14356ea7b1 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -858,7 +858,7 @@ OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotal const ScDPDimension* pDataDim = mrSource.GetDataDimension(nMeasure); if (pDataDim) { - const o3tl::optional<OUString> & pLayoutName = pDataDim->GetLayoutName(); + const std::optional<OUString> & pLayoutName = pDataDim->GetLayoutName(); if (pLayoutName) return *pLayoutName; } @@ -1380,7 +1380,7 @@ void ScDPResultMember::FillMemberResults( const ScDPMember* pMemberDesc = GetDPMember(); if (pMemberDesc) { - const o3tl::optional<OUString> & pLayoutName = pMemberDesc->GetLayoutName(); + const std::optional<OUString> & pLayoutName = pMemberDesc->GetLayoutName(); if (pLayoutName) { aCaption = *pLayoutName; @@ -1482,7 +1482,7 @@ void ScDPResultMember::FillMemberResults( if (pMemberDesc) { // single data field layout. - const o3tl::optional<OUString> & pSubtotalName = pParentDim->GetSubtotalName(); + const std::optional<OUString> & pSubtotalName = pParentDim->GetSubtotalName(); if (pSubtotalName) aSubStr = lcl_parseSubtotalName(*pSubtotalName, aCaption); pArray[rPos].Flags &= ~sheet::MemberResultFlags::GRANDTOTAL; @@ -1490,7 +1490,7 @@ void ScDPResultMember::FillMemberResults( else { // root member - subtotal (grand total?) for multi-data field layout. - const o3tl::optional<OUString> & pGrandTotalName = pResultData->GetSource().GetGrandTotalName(); + const std::optional<OUString> & pGrandTotalName = pResultData->GetSource().GetGrandTotalName(); if (pGrandTotalName) aSubStr = *pGrandTotalName; pArray[rPos].Flags |= sheet::MemberResultFlags::GRANDTOTAL; |