From 7b355da6853af6678c4ba22710d157cf8a6d43eb Mon Sep 17 00:00:00 2001 From: Deena Francis Date: Mon, 16 Feb 2015 22:28:52 +0530 Subject: Enhancement tdf#87972 : Cannot repeat items labels on a pivot table Change-Id: I44b2521ea548b51a1b3e9b42cfa64c5f50d7798a Reviewed-on: https://gerrit.libreoffice.org/14504 Tested-by: Jenkins Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida --- sc/source/ui/dbgui/PivotLayoutDialog.cxx | 1 + sc/source/ui/dbgui/pvfundlg.cxx | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'sc/source/ui/dbgui') diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index b5d2c658e352..c8087b39920f 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -538,6 +538,7 @@ void ScPivotLayoutDialog::ApplyLabelData(ScDPSaveData& rSaveData) pSaveDimensions->SetUsedHierarchy(pLabelData.mnUsedHier); pSaveDimensions->SetShowEmpty(pLabelData.mbShowAll); + pSaveDimensions->SetRepeatItemLabels(pLabelData.mbRepeatItemLabels); pSaveDimensions->SetSortInfo(&pLabelData.maSortInfo); pSaveDimensions->SetLayoutInfo(&pLabelData.maLayoutInfo); pSaveDimensions->SetAutoShowInfo(&pLabelData.maShowInfo); diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 8f5c24bd15e9..3f55a4be76d9 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -452,6 +452,7 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const rLabelData.maSortInfo = maLabelData.maSortInfo; rLabelData.maLayoutInfo = maLabelData.maLayoutInfo; rLabelData.maShowInfo = maLabelData.maShowInfo; + rLabelData.mbRepeatItemLabels = maLabelData.mbRepeatItemLabels; } void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) @@ -524,6 +525,7 @@ ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj get(m_pLayoutFrame, "layoutframe"); get(m_pLbLayout, "layout"); get(m_pCbLayoutEmpty, "emptyline"); + get(m_pCbRepeatItemLabels, "repeatitemlabels"); get(m_pCbShow, "show"); get(m_pNfShow, "items"); get(m_pFtShow, "showft"); @@ -566,6 +568,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const rLabelData.maLayoutInfo.LayoutMode = m_xLbLayoutWrp->GetControlValue(); rLabelData.maLayoutInfo.AddEmptyLines = m_pCbLayoutEmpty->IsChecked(); + rLabelData.mbRepeatItemLabels = m_pCbRepeatItemLabels->IsChecked(); // *** AUTO SHOW *** @@ -648,6 +651,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou m_xLbLayoutWrp->SetControlValue( maLabelData.maLayoutInfo.LayoutMode ); m_pCbLayoutEmpty->Check( maLabelData.maLayoutInfo.AddEmptyLines ); + m_pCbRepeatItemLabels->Check( maLabelData.mbRepeatItemLabels ); // *** AUTO SHOW *** -- cgit