From f44fb845f275e9be3861bb299f2bb3689280a92e Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Mon, 17 Apr 2017 19:20:27 +0200 Subject: tdf#107067 remove data buttons as they don't have any action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I91751cfc32a75ecd72dc711821d918b6a5d9f83f Reviewed-on: https://gerrit.libreoffice.org/36736 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- chart2/source/view/main/ChartView.cxx | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 6dccabf2d74f..364828692c2c 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2488,8 +2488,8 @@ bool lcl_createLegend( const uno::Reference< XLegend > & xLegend return true; } -void lcl_createButtons(const uno::Reference< drawing::XShapes>& xPageShapes, - const uno::Reference< lang::XMultiServiceFactory>& xShapeFactory, +void lcl_createButtons(const uno::Reference& xPageShapes, + const uno::Reference& xShapeFactory, ChartModel& rModel, awt::Rectangle& rRemainingSpace) { @@ -2520,23 +2520,6 @@ void lcl_createButtons(const uno::Reference< drawing::XShapes>& xPageShapes, rRemainingSpace.Height -= (aSize.Height + 100 + 100); } - if (xPivotTableDataProvider->getDataFields().hasElements()) - { - x = 200; - for (css::chart2::data::PivotTableFieldEntry const & rDataFieldEntry : xPivotTableDataProvider->getDataFields()) - { - std::unique_ptr pButton(new VButton); - pButton->init(xPageShapes, xShapeFactory); - awt::Point aNewPosition = awt::Point(rRemainingSpace.X + x + 100, rRemainingSpace.Y + 100); - pButton->setLabel(rDataFieldEntry.Name); - pButton->setCID("FieldButton.Data." + OUString::number(rDataFieldEntry.DimensionIndex)); - pButton->createShapes(aNewPosition, aSize, xModelPage); - x += aSize.Width + 100; - } - rRemainingSpace.Y += (aSize.Height + 100 + 100); - rRemainingSpace.Height -= (aSize.Height + 100 + 100); - } - if (xPivotTableDataProvider->getRowFields().hasElements()) { x = 200; -- cgit v1.2.3