[Libreoffice-commits] core.git: Branch 'feature/pivotcharts' - 2 commits - chart2/source

[Tomaž Vajngerl]

 chart2/source/view/main/ChartView.cxx |    6 +++---
 chart2/source/view/main/VLegend.cxx   |    9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 097a3ecf20d2e00101619b6bbd61acce09de0864
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Mar 9 17:22:55 2017 +0100

    chart: change field button CID so it is easier to parse
    
    Change-Id: If75e6a247ff619e850e6f07f308d3863754db5d4

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 54b1297..9d1fe9c 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2514,7 +2514,7 @@ void lcl_createButtons(const uno::Reference< drawing::XShapes>& xPageShapes,
             pButton->init(xPageShapes, xShapeFactory);
             awt::Point aNewPosition = awt::Point(rRemainingSpace.X + x + 100, rRemainingSpace.Y + 100);
             pButton->setLabel(rPageField);
-            pButton->setCID("PageFieldButton." + OUString::number(nCIDIndex));
+            pButton->setCID("FieldButton.Page." + OUString::number(nCIDIndex));
             pButton->createShapes(aNewPosition, aSize, xModelPage);
             x += aSize.Width + 100;
             nCIDIndex += 1;
@@ -2533,7 +2533,7 @@ void lcl_createButtons(const uno::Reference< drawing::XShapes>& xPageShapes,
             pButton->init(xPageShapes, xShapeFactory);
             awt::Point aNewPosition = awt::Point(rRemainingSpace.X + x + 100, rRemainingSpace.Y + 100);
             pButton->setLabel(rDataField);
-            pButton->setCID("DataFieldButton." + OUString::number(nCIDIndex));
+            pButton->setCID("FieldButton.Data." + OUString::number(nCIDIndex));
             pButton->createShapes(aNewPosition, aSize, xModelPage);
             x += aSize.Width + 100;
             nCIDIndex += 1;
@@ -2553,7 +2553,7 @@ void lcl_createButtons(const uno::Reference< drawing::XShapes>& xPageShapes,
             awt::Point aNewPosition = awt::Point(rRemainingSpace.X + x + 100,
                                                  rRemainingSpace.Y + rRemainingSpace.Height - aSize.Height - 100);
             pButton->setLabel(rRowField);
-            pButton->setCID("ColumnFieldButton." + OUString::number(nCIDIndex));
+            pButton->setCID("FieldButton.Column." + OUString::number(nCIDIndex));
             pButton->createShapes(aNewPosition, aSize, xModelPage);
             x += aSize.Width + 100;
             nCIDIndex += 1;
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index eda2fd4..3688411 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -788,7 +788,7 @@ std::vector<std::shared_ptr<VButton>> lcl_createButtons(
         pButton->init(xLegendContainer, xShapeFactory);
         awt::Point aNewPosition = awt::Point(100, y);
         pButton->setLabel(sColumnField);
-        pButton->setCID("RowFieldButton." + OUString::number(nCIDIndex));
+        pButton->setCID("FieldButton.Row." + OUString::number(nCIDIndex));
         pButton->createShapes(aNewPosition, aSize, xModelPage);
         nCIDIndex += 1;
         y += aSize.Height + 100;;
commit 1dd706e7644c8055b272d4f863a79fd264ab1e88
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Mar 9 17:19:29 2017 +0100

    charts: fix drawing multiple buttons in legend
    
    Change-Id: I101d6ee6e06e78ba5e0748a796b6640c47fa67cf

diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index b79c95a..eda2fd4 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -780,19 +780,20 @@ std::vector<std::shared_ptr<VButton>> lcl_createButtons(
 
     int nCIDIndex = 0;
     awt::Size aSize(2000, 700);
-
+    int y = 100;
     for (OUString const & sColumnField : aColumnFields)
     {
         std::shared_ptr<VButton> pButton(new VButton);
         aButtons.push_back(pButton);
         pButton->init(xLegendContainer, xShapeFactory);
-        awt::Point aNewPosition = awt::Point(100, 100);
+        awt::Point aNewPosition = awt::Point(100, y);
         pButton->setLabel(sColumnField);
         pButton->setCID("RowFieldButton." + OUString::number(nCIDIndex));
         pButton->createShapes(aNewPosition, aSize, xModelPage);
         nCIDIndex += 1;
+        y += aSize.Height + 100;;
     }
-    nUsedHeight += aSize.Height + 100;
+    nUsedHeight += y + 100;
 
     return aButtons;
 }