summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-03 10:05:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-03 10:53:01 +0100
commit0528012fd0dc4b93645ef7790b0db9d1cecbae66 (patch)
treee3adb8f0200fc95c06f62205b346244c79ae88ca /chart2
parentf612839ed9200a3900ae5c3a2e12beccfa37b11e (diff)
loplugin:constantparam
Change-Id: If2dee122bf07dc179fd8f6e766442ec1891a5f3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87845 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/ChartResourceGroups.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx4
-rw-r--r--chart2/source/controller/inc/ObjectHierarchy.hxx8
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx2
-rw-r--r--chart2/source/controller/main/ObjectHierarchy.cxx3
-rw-r--r--chart2/source/controller/sidebar/ChartTypePanel.cxx4
-rw-r--r--chart2/source/inc/ChartResourceGroups.hxx2
7 files changed, 12 insertions, 15 deletions
diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
index 2ba46bbad5c8..199606abef69 100644
--- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx
+++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
@@ -122,12 +122,12 @@ StackingResourceGroup::StackingResourceGroup(weld::Builder* pBuilder)
m_xRB_Stack_Z->connect_toggled(LINK(this, StackingResourceGroup, StackingChangeHdl));
}
-void StackingResourceGroup::showControls(bool bShow, bool bShowDeepStacking)
+void StackingResourceGroup::showControls(bool bShow)
{
m_xCB_Stacked->set_visible(bShow);
m_xRB_Stack_Y->set_visible(bShow);
m_xRB_Stack_Y_Percent->set_visible(bShow);
- m_xRB_Stack_Z->set_visible(bShow && bShowDeepStacking);
+ m_xRB_Stack_Z->set_visible(false);
}
void StackingResourceGroup::fillControls(const ChartTypeParameter& rParameter)
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 6c603c344270..97fbb5bf878f 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -266,7 +266,7 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll
bool bShow = rTypeController.shouldShow_3DLookControl();
m_pDim3DLookResourceGroup->showControls( bShow );
bShow = rTypeController.shouldShow_StackingControl();
- m_pStackingResourceGroup->showControls( bShow, false );
+ m_pStackingResourceGroup->showControls( bShow );
bShow = rTypeController.shouldShow_SplineControl();
m_pSplineResourceGroup->showControls( bShow );
bShow = rTypeController.shouldShow_GeometryControl();
@@ -344,7 +344,7 @@ void ChartTypeTabPage::initializePage()
{
m_xSubTypeList->Hide();
m_pDim3DLookResourceGroup->showControls( false );
- m_pStackingResourceGroup->showControls( false, false );
+ m_pStackingResourceGroup->showControls( false );
m_pSplineResourceGroup->showControls( false );
m_pGeometryResourceGroup->showControls( false );
m_pSortByXValuesResourceGroup->showControls( false );
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 10b95b951949..5b8240a9a103 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -42,15 +42,13 @@ class ObjectHierarchy
public:
typedef std::vector< ObjectIdentifier > tChildContainer;
- /** @param bFlattenDiagram
- If <TRUE/>, the content of the diagram (data series, wall, floor,
- etc.) is treated as being at the same level as the diagram. (This is
- used for keyboard navigation).
+ /** The content of the diagram (data series, wall, floor,
+ etc.) is treated as being at the same level as the diagram. (This is
+ used for keyboard navigation).
*/
explicit ObjectHierarchy(
const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument,
ExplicitValueProvider * pExplicitValueProvider,
- bool bFlattenDiagram = false,
bool bOrderingForElementSelector = false );
~ObjectHierarchy();
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 4cc61cc1d1b0..30cc4102c3e2 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -105,7 +105,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
if( xFact.is() )
xChartView = xFact->createInstance( CHART_VIEW_SERVICE_NAME );
ExplicitValueProvider* pExplicitValueProvider = nullptr; //ExplicitValueProvider::getExplicitValueProvider(xChartView); this creates all visible data points, that's too much
- ObjectHierarchy aHierarchy( xChartDoc, pExplicitValueProvider, true /*bFlattenDiagram*/, true /*bOrderingForElementSelector*/ );
+ ObjectHierarchy aHierarchy( xChartDoc, pExplicitValueProvider, true /*bOrderingForElementSelector*/ );
lcl_addObjectsToList( aHierarchy, ::chart::ObjectHierarchy::getRootNodeOID(), m_aEntries, 0, xChartDoc );
if( bAddSelectionToList )
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 429d9ad7e272..2096ab4d6cce 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -611,9 +611,8 @@ ObjectIdentifier ImplObjectHierarchy::getParent(
ObjectHierarchy::ObjectHierarchy(
const Reference< XChartDocument > & xChartDocument,
ExplicitValueProvider * pExplicitValueProvider /* = 0 */,
- bool bFlattenDiagram /* = false */,
bool bOrderingForElementSelector /* = false */) :
- m_apImpl( new impl::ImplObjectHierarchy( xChartDocument, pExplicitValueProvider, bFlattenDiagram, bOrderingForElementSelector ))
+ m_apImpl( new impl::ImplObjectHierarchy( xChartDocument, pExplicitValueProvider, /*bFlattenDiagram*/false, bOrderingForElementSelector ))
{}
ObjectHierarchy::~ObjectHierarchy()
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index 846dbed13570..f6334864b049 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -217,7 +217,7 @@ void ChartTypePanel::Initialize()
{
m_xSubTypeList->Hide();
m_pDim3DLookResourceGroup->showControls(false);
- m_pStackingResourceGroup->showControls(false, false);
+ m_pStackingResourceGroup->showControls(false);
m_pSplineResourceGroup->showControls(false);
m_pGeometryResourceGroup->showControls(false);
m_pSortByXValuesResourceGroup->showControls(false);
@@ -314,7 +314,7 @@ void ChartTypePanel::showAllControls(ChartTypeDialogController& rTypeController)
bool bShow = rTypeController.shouldShow_3DLookControl();
m_pDim3DLookResourceGroup->showControls(bShow);
bShow = rTypeController.shouldShow_StackingControl();
- m_pStackingResourceGroup->showControls(bShow, false);
+ m_pStackingResourceGroup->showControls(bShow);
bShow = rTypeController.shouldShow_SplineControl();
m_pSplineResourceGroup->showControls(bShow);
bShow = rTypeController.shouldShow_GeometryControl();
diff --git a/chart2/source/inc/ChartResourceGroups.hxx b/chart2/source/inc/ChartResourceGroups.hxx
index 3317f83acd09..f3b3e2f4b2c5 100644
--- a/chart2/source/inc/ChartResourceGroups.hxx
+++ b/chart2/source/inc/ChartResourceGroups.hxx
@@ -80,7 +80,7 @@ class StackingResourceGroup : public ChangingResource
public:
explicit StackingResourceGroup(weld::Builder* pBuilder);
- void showControls(bool bShow, bool bShowDeepStacking);
+ void showControls(bool bShow);
void fillControls(const ChartTypeParameter& rParameter);
void fillParameter(ChartTypeParameter& rParameter);