[Libreoffice-commits] core.git: chart2/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.co.uk
Thu Apr 20 14:10:38 UTC 2017
chart2/source/view/main/ChartView.cxx | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
New commits:
commit f44fb845f275e9be3861bb299f2bb3689280a92e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Mon Apr 17 19:20:27 2017 +0200
tdf#107067 remove data buttons as they don't have any action
Change-Id: I91751cfc32a75ecd72dc711821d918b6a5d9f83f
Reviewed-on: https://gerrit.libreoffice.org/36736
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
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<drawing::XShapes>& xPageShapes,
+ const uno::Reference<lang::XMultiServiceFactory>& 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<VButton> 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;
More information about the Libreoffice-commits
mailing list