[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 13577b6c3d64c6cae673152c4d10489d8380bb7f
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Sat Mar 6 17:44:11 2021 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Mar 8 23:30:14 2021 +0100

    Pivot table: fix data field subdialog
    
    Changes done in 'Data field' subdialog were not
    applied in the result pivot table.
    
    Change-Id: Ia221380a9ab3d292033512b9b642646f4b53a39d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112096
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index da54e26ad5a1..76c9e45a9ff3 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -92,23 +92,24 @@ IMPL_LINK_NOARG(ScPivotLayoutTreeListData, DoubleClickHdl, weld::TreeView&, bool
 
     mpFunctionDlg = pFactory->CreateScDPFunctionDlg(mxControl.get(), mpParent->GetLabelDataVector(), rCurrentLabelData, rCurrentFunctionData);
 
-    mpFunctionDlg->StartExecuteAsync([this, pCurrentItemValue, rCurrentFunctionData,
+    mpFunctionDlg->StartExecuteAsync([this, pCurrentItemValue,
                                 rCurrentLabelData, nEntry](int nResult) mutable {
         if (nResult == RET_OK)
         {
-            rCurrentFunctionData.mnFuncMask = mpFunctionDlg->GetFuncMask();
+            ScPivotFuncData& rFunctionData = pCurrentItemValue->maFunctionData;
+            rFunctionData.mnFuncMask = mpFunctionDlg->GetFuncMask();
             rCurrentLabelData.mnFuncMask = mpFunctionDlg->GetFuncMask();
 
-            rCurrentFunctionData.maFieldRef = mpFunctionDlg->GetFieldRef();
+            rFunctionData.maFieldRef = mpFunctionDlg->GetFieldRef();
 
-            ScDPLabelData& rDFData = mpParent->GetLabelData(rCurrentFunctionData.mnCol);
+            ScDPLabelData& rDFData = mpParent->GetLabelData(rFunctionData.mnCol);
 
             AdjustDuplicateCount(pCurrentItemValue);
 
             OUString sDataItemName = lclCreateDataItemName(
-                                        rCurrentFunctionData.mnFuncMask,
+                                        rFunctionData.mnFuncMask,
                                         rDFData.maName,
-                                        rCurrentFunctionData.mnDupCount);
+                                        rFunctionData.mnDupCount);
 
             mxControl->set_text(nEntry, sDataItemName);
         }