ChartDumpTest: Test bar charts

Change-Id: If4b8b207ba4ab379977d1a64c572187f48c4b9b4
Reviewed-on: https://gerrit.libreoffice.org/34186
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>

15 files changed, 1169 insertions, 680 deletions

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index e18cf25d5016..b5d74a22e078 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -713,7 +713,7 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false)
     }
 }
 
-DECLARE_DUMP_TEST(ColumnChartTest, Chart2DumpTest, false)
+DECLARE_DUMP_TEST(ColumnBarChartTest, Chart2DumpTest, false)
 {
     const std::vector<OUString> aTestFiles =
     {
@@ -721,6 +721,9 @@ DECLARE_DUMP_TEST(ColumnChartTest, Chart2DumpTest, false)
         "stacked_column_chart.ods",
         "percent_stacked_column_chart.ods",
         "column_chart_small_spacing.ods",
+        "normal_bar_chart.ods",
+        "stacked_bar_chart.ods",
+        "percent_stacked_bar_chart.ods",
     };
 
     for (const OUString& sTestFile : aTestFiles)
@@ -742,44 +745,44 @@ DECLARE_DUMP_TEST(ColumnChartTest, Chart2DumpTest, false)
 
         for (size_t nSeries = 0; nSeries < nSeriesCount; ++nSeries)
         {
-            uno::Reference<drawing::XShape> xSeriesColumns = getShapeByName(xShapes, "CID/D=0:CS=0:CT=0:Series=" + OUString::number(nSeries));
-            CPPUNIT_ASSERT(xSeriesColumns.is());
-            CPPUNIT_DUMP_ASSERT_NOTE("Series " + OUString::number(nSeries) + " Columns");
-
-            // Check column count in the series
-            uno::Reference<container::XIndexAccess> xIndexAccess(xSeriesColumns, UNO_QUERY_THROW);
-            sal_Int32 nColumnCountInSeries = xIndexAccess->getCount();
-            CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(nColumnCountInSeries);
-
-            // Check column fill style and color
-            Reference< beans::XPropertySet > xColumnPropSet(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
-            drawing::FillStyle aSeriesColumnFillStyle;
-            xColumnPropSet->getPropertyValue(UNO_NAME_FILLSTYLE) >>= aSeriesColumnFillStyle;
-            CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aSeriesColumnFillStyle));
-            util::Color aSeriesColumnFillColor = 0;
-            xColumnPropSet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= aSeriesColumnFillColor;
-            CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aSeriesColumnFillColor));
-
-            for (sal_Int32 nColumn = 0; nColumn < nColumnCountInSeries; ++nColumn)
+            uno::Reference<drawing::XShape> xSeriesColumnsOrBars = getShapeByName(xShapes, "CID/D=0:CS=0:CT=0:Series=" + OUString::number(nSeries));
+            CPPUNIT_ASSERT(xSeriesColumnsOrBars.is());
+            CPPUNIT_DUMP_ASSERT_NOTE("Series " + OUString::number(nSeries) + " ColumnsOrBars");
+
+            // Check column/bar count in the series
+            uno::Reference<container::XIndexAccess> xIndexAccess(xSeriesColumnsOrBars, UNO_QUERY_THROW);
+            sal_Int32 nColumnOrBarCountInSeries = xIndexAccess->getCount();
+            CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(nColumnOrBarCountInSeries);
+
+            // Check column/bar fill style and color
+            Reference< beans::XPropertySet > xColumnOrBarPropSet(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
+            drawing::FillStyle aSeriesColumnOrBarFillStyle;
+            xColumnOrBarPropSet->getPropertyValue(UNO_NAME_FILLSTYLE) >>= aSeriesColumnOrBarFillStyle;
+            CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle));
+            util::Color aSeriesColumnOrBarFillColor = 0;
+            xColumnOrBarPropSet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= aSeriesColumnOrBarFillColor;
+            CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aSeriesColumnOrBarFillColor));
+
+            for (sal_Int32 nColumnOrBar = 0; nColumnOrBar < nColumnOrBarCountInSeries; ++nColumnOrBar)
             {
-                uno::Reference<drawing::XShape> xColumn(xIndexAccess->getByIndex(nColumn), UNO_QUERY_THROW);
-                uno::Reference<container::XNamed> xNamedShape(xIndexAccess->getByIndex(nColumn), uno::UNO_QUERY);
+                uno::Reference<drawing::XShape> xColumnOrBar(xIndexAccess->getByIndex(nColumnOrBar), UNO_QUERY_THROW);
+                uno::Reference<container::XNamed> xNamedShape(xIndexAccess->getByIndex(nColumnOrBar), uno::UNO_QUERY);
                 CPPUNIT_DUMP_ASSERT_NOTE(xNamedShape->getName());
 
                 // Check size and position
-                awt::Point aColumnPosition = xColumn->getPosition();
-                CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aColumnPosition.X, INT_EPS);
-                CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aColumnPosition.Y, INT_EPS);
-                awt::Size aColumnSize = xColumn->getSize();
-                CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aColumnSize.Height, INT_EPS);
-                CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aColumnSize.Width, INT_EPS);
+                awt::Point aColumnOrBarPosition = xColumnOrBar->getPosition();
+                CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aColumnOrBarPosition.X, INT_EPS);
+                CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aColumnOrBarPosition.Y, INT_EPS);
+                awt::Size aColumnOrBarSize = xColumnOrBar->getSize();
+                CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aColumnOrBarSize.Height, INT_EPS);
+                CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aColumnOrBarSize.Width, INT_EPS);
 
                 // Check transformation
-                Reference< beans::XPropertySet > xPropSet(xColumn, UNO_QUERY_THROW);
+                Reference< beans::XPropertySet > xPropSet(xColumnOrBar, UNO_QUERY_THROW);
                 CPPUNIT_ASSERT(xPropSet.is());
-                drawing::HomogenMatrix3 aColumnTransformation;
-                xPropSet->getPropertyValue("Transformation") >>= aColumnTransformation;
-                CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aColumnTransformation);
+                drawing::HomogenMatrix3 aColumnOrBarTransformation;
+                xPropSet->getPropertyValue("Transformation") >>= aColumnOrBarTransformation;
+                CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aColumnOrBarTransformation);
             }
         }
     }
diff --git a/chart2/qa/extras/chart2dump/data/normal_bar_chart.ods b/chart2/qa/extras/chart2dump/data/normal_bar_chart.ods
new file mode 100755
index 000000000000..191d34087488
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/normal_bar_chart.ods
diff --git a/chart2/qa/extras/chart2dump/data/percent_stacked_bar_chart.ods b/chart2/qa/extras/chart2dump/data/percent_stacked_bar_chart.ods
new file mode 100755
index 000000000000..b44ecf7e6423
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/percent_stacked_bar_chart.ods
diff --git a/chart2/qa/extras/chart2dump/data/stacked_bar_chart.ods b/chart2/qa/extras/chart2dump/data/stacked_bar_chart.ods
new file mode 100755
index 000000000000..5770591fd53e
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/stacked_bar_chart.ods
diff --git a/chart2/qa/extras/chart2dump/reference/columnbarcharttest/column_chart_small_spacing.txt b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/column_chart_small_spacing.txt
new file mode 100755
index 000000000000..b3192a728377
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/column_chart_small_spacing.txt
@@ -0,0 +1,162 @@
+// nSeriesCount
+4
+/// Series 0 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+16711807
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
+// aColumnOrBarPosition.X
+13522
+// aColumnOrBarPosition.Y
+4147
+// aColumnOrBarSize.Height
+3202
+// aColumnOrBarSize.Width
+1169
+// aColumnOrBarTransformation
+1169;0;13522;0;3202;4147;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
+// aColumnOrBarPosition.X
+8610
+// aColumnOrBarPosition.Y
+1946
+// aColumnOrBarSize.Height
+5403
+// aColumnOrBarSize.Width
+1170
+// aColumnOrBarTransformation
+1170;0;8610;0;5403;1946;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
+// aColumnOrBarPosition.X
+3698
+// aColumnOrBarPosition.Y
+4414
+// aColumnOrBarSize.Height
+2935
+// aColumnOrBarSize.Width
+1170
+// aColumnOrBarTransformation
+1170;0;3698;0;2935;4414;0;0;1
+/// Series 1 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
+// aColumnOrBarPosition.X
+14691
+// aColumnOrBarPosition.Y
+3747
+// aColumnOrBarSize.Height
+3602
+// aColumnOrBarSize.Width
+1170
+// aColumnOrBarTransformation
+1170;0;14691;0;3602;3747;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
+// aColumnOrBarPosition.X
+9780
+// aColumnOrBarPosition.Y
+4347
+// aColumnOrBarSize.Height
+3002
+// aColumnOrBarSize.Width
+1169
+// aColumnOrBarTransformation
+1169;0;9780;0;3002;4347;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
+// aColumnOrBarPosition.X
+4868
+// aColumnOrBarPosition.Y
+5247
+// aColumnOrBarSize.Height
+2102
+// aColumnOrBarSize.Width
+1169
+// aColumnOrBarTransformation
+1169;0;4868;0;2102;5247;0;0;1
+/// Series 2 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
+// aColumnOrBarPosition.X
+15861
+// aColumnOrBarPosition.Y
+5214
+// aColumnOrBarSize.Height
+2135
+// aColumnOrBarSize.Width
+1169
+// aColumnOrBarTransformation
+1169;0;15861;0;2135;5214;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
+// aColumnOrBarPosition.X
+10949
+// aColumnOrBarPosition.Y
+4414
+// aColumnOrBarSize.Height
+2935
+// aColumnOrBarSize.Width
+1169
+// aColumnOrBarTransformation
+1169;0;10949;0;2935;4414;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
+// aColumnOrBarPosition.X
+6037
+// aColumnOrBarPosition.Y
+6281
+// aColumnOrBarSize.Height
+1068
+// aColumnOrBarSize.Width
+1170
+// aColumnOrBarTransformation
+1170;0;6037;0;1068;6281;0;0;1
+/// Series 3 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+2
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
+// aColumnOrBarPosition.X
+17030
+// aColumnOrBarPosition.Y
+2335
+// aColumnOrBarSize.Height
+5014
+// aColumnOrBarSize.Width
+1170
+// aColumnOrBarTransformation
+1170;0;17030;0;5014;2335;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
+// aColumnOrBarPosition.X
+12118
+// aColumnOrBarPosition.Y
+4006
+// aColumnOrBarSize.Height
+3343
+// aColumnOrBarSize.Width
+1170
+// aColumnOrBarTransformation
+1170;0;12118;0;3343;4006;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
+// aColumnOrBarPosition.X
+7207
+// aColumnOrBarPosition.Y
+5677
+// aColumnOrBarSize.Height
+1672
+// aColumnOrBarSize.Width
+1169
+// aColumnOrBarTransformation
+1169;0;7207;0;1672;5677;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columnbarcharttest/normal_bar_chart.txt b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/normal_bar_chart.txt
new file mode 100755
index 000000000000..7828d7907d69
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/normal_bar_chart.txt
@@ -0,0 +1,162 @@
+// nSeriesCount
+4
+/// Series 0 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+16711807
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+2709
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+7071
+// aColumnOrBarTransformation
+7071;0;3582;0;364;2709;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+4710
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+11932
+// aColumnOrBarTransformation
+11932;0;3582;0;364;4710;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+6712
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+6482
+// aColumnOrBarTransformation
+6482;0;3582;0;364;6712;0;0;1
+/// Series 1 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+2345
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+7956
+// aColumnOrBarTransformation
+7956;0;3582;0;364;2345;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+4347
+// aColumnOrBarSize.Height
+363
+// aColumnOrBarSize.Width
+6630
+// aColumnOrBarTransformation
+6630;0;3582;0;363;4347;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+6348
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+4641
+// aColumnOrBarTransformation
+4641;0;3582;0;364;6348;0;0;1
+/// Series 2 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+1981
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+4714
+// aColumnOrBarTransformation
+4714;0;3582;0;364;1981;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+3983
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+6482
+// aColumnOrBarTransformation
+6482;0;3582;0;364;3983;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+5984
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+2357
+// aColumnOrBarTransformation
+2357;0;3582;0;364;5984;0;0;1
+/// Series 3 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+1617
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+11072
+// aColumnOrBarTransformation
+11072;0;3582;0;364;1617;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+3619
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+7381
+// aColumnOrBarTransformation
+7381;0;3582;0;364;3619;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+5620
+// aColumnOrBarSize.Height
+364
+// aColumnOrBarSize.Width
+3690
+// aColumnOrBarTransformation
+3690;0;3582;0;364;5620;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columnbarcharttest/normal_column_chart.txt b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/normal_column_chart.txt
new file mode 100755
index 000000000000..5d2bf0533ba9
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/normal_column_chart.txt
@@ -0,0 +1,162 @@
+// nSeriesCount
+4
+/// Series 0 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+16711807
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
+// aColumnOrBarPosition.X
+14075
+// aColumnOrBarPosition.Y
+4147
+// aColumnOrBarSize.Height
+3202
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;14075;0;3202;4147;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
+// aColumnOrBarPosition.X
+9163
+// aColumnOrBarPosition.Y
+1946
+// aColumnOrBarSize.Height
+5403
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;9163;0;5403;1946;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
+// aColumnOrBarPosition.X
+4251
+// aColumnOrBarPosition.Y
+4414
+// aColumnOrBarSize.Height
+2935
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;4251;0;2935;4414;0;0;1
+/// Series 1 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
+// aColumnOrBarPosition.X
+14968
+// aColumnOrBarPosition.Y
+3747
+// aColumnOrBarSize.Height
+3602
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;14968;0;3602;3747;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
+// aColumnOrBarPosition.X
+10056
+// aColumnOrBarPosition.Y
+4347
+// aColumnOrBarSize.Height
+3002
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;10056;0;3002;4347;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
+// aColumnOrBarPosition.X
+5144
+// aColumnOrBarPosition.Y
+5247
+// aColumnOrBarSize.Height
+2102
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;5144;0;2102;5247;0;0;1
+/// Series 2 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
+// aColumnOrBarPosition.X
+15861
+// aColumnOrBarPosition.Y
+5214
+// aColumnOrBarSize.Height
+2135
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;15861;0;2135;5214;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
+// aColumnOrBarPosition.X
+10949
+// aColumnOrBarPosition.Y
+4414
+// aColumnOrBarSize.Height
+2935
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;10949;0;2935;4414;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
+// aColumnOrBarPosition.X
+6037
+// aColumnOrBarPosition.Y
+6281
+// aColumnOrBarSize.Height
+1068
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;6037;0;1068;6281;0;0;1
+/// Series 3 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
+// aColumnOrBarPosition.X
+16754
+// aColumnOrBarPosition.Y
+2335
+// aColumnOrBarSize.Height
+5014
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;16754;0;5014;2335;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
+// aColumnOrBarPosition.X
+11842
+// aColumnOrBarPosition.Y
+4006
+// aColumnOrBarSize.Height
+3343
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;11842;0;3343;4006;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
+// aColumnOrBarPosition.X
+6930
+// aColumnOrBarPosition.Y
+5677
+// aColumnOrBarSize.Height
+1672
+// aColumnOrBarSize.Width
+893
+// aColumnOrBarTransformation
+893;0;6930;0;1672;5677;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columnbarcharttest/percent_stacked_bar_chart.txt b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/percent_stacked_bar_chart.txt
new file mode 100755
index 000000000000..5fa9301b129f
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/percent_stacked_bar_chart.txt
@@ -0,0 +1,162 @@
+// nSeriesCount
+4
+/// Series 0 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+16711807
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+1678
+// aColumnOrBarSize.Height
+1334
+// aColumnOrBarSize.Width
+3381
+// aColumnOrBarTransformation
+3381;0;3582;0;1334;1678;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+3679
+// aColumnOrBarSize.Height
+1335
+// aColumnOrBarSize.Width
+5422
+// aColumnOrBarTransformation
+5422;0;3582;0;1335;3679;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+5681
+// aColumnOrBarSize.Height
+1334
+// aColumnOrBarSize.Width
+5562
+// aColumnOrBarTransformation
+5562;0;3582;0;1334;5681;0;0;1
+/// Series 1 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
+// aColumnOrBarPosition.X
+6963
+// aColumnOrBarPosition.Y
+1678
+// aColumnOrBarSize.Height
+1334
+// aColumnOrBarSize.Width
+3804
+// aColumnOrBarTransformation
+3804;0;6963;0;1334;1678;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
+// aColumnOrBarPosition.X
+9004
+// aColumnOrBarPosition.Y
+3679
+// aColumnOrBarSize.Height
+1335
+// aColumnOrBarSize.Width
+3013
+// aColumnOrBarTransformation
+3013;0;9004;0;1335;3679;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
+// aColumnOrBarPosition.X
+9144
+// aColumnOrBarPosition.Y
+5681
+// aColumnOrBarSize.Height
+1334
+// aColumnOrBarSize.Width
+3982
+// aColumnOrBarTransformation
+3982;0;9144;0;1334;5681;0;0;1
+/// Series 2 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+255
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
+// aColumnOrBarPosition.X
+10767
+// aColumnOrBarPosition.Y
+1678
+// aColumnOrBarSize.Height
+1334
+// aColumnOrBarSize.Width
+2255
+// aColumnOrBarTransformation
+2255;0;10767;0;1334;1678;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
+// aColumnOrBarPosition.X
+12017
+// aColumnOrBarPosition.Y
+3679
+// aColumnOrBarSize.Height
+1335
+// aColumnOrBarSize.Width
+2945
+// aColumnOrBarTransformation
+2945;0;12017;0;1335;3679;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
+// aColumnOrBarPosition.X
+13126
+// aColumnOrBarPosition.Y
+5681
+// aColumnOrBarSize.Height
+1334
+// aColumnOrBarSize.Width
+2023
+// aColumnOrBarTransformation
+2023;0;13126;0;1334;5681;0;0;1
+/// Series 3 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
+// aColumnOrBarPosition.X
+13022
+// aColumnOrBarPosition.Y
+1678
+// aColumnOrBarSize.Height
+1334
+// aColumnOrBarSize.Width
+5295
+// aColumnOrBarTransformation
+5295;0;13022;0;1334;1678;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
+// aColumnOrBarPosition.X
+14962
+// aColumnOrBarPosition.Y
+3679
+// aColumnOrBarSize.Height
+1335
+// aColumnOrBarSize.Width
+3355
+// aColumnOrBarTransformation
+3355;0;14962;0;1335;3679;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
+// aColumnOrBarPosition.X
+15149
+// aColumnOrBarPosition.Y
+5681
+// aColumnOrBarSize.Height
+1334
+// aColumnOrBarSize.Width
+3168
+// aColumnOrBarTransformation
+3168;0;15149;0;1334;5681;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columnbarcharttest/percent_stacked_column_chart.txt b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/percent_stacked_column_chart.txt
new file mode 100755
index 000000000000..c183d4ea52d7
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/percent_stacked_column_chart.txt
@@ -0,0 +1,162 @@
+// nSeriesCount
+4
+/// Series 0 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+16711807
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
+// aColumnOrBarPosition.X
+14878
+// aColumnOrBarPosition.Y
+5971
+// aColumnOrBarSize.Height
+1378
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;14878;0;1378;5971;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
+// aColumnOrBarPosition.X
+9967
+// aColumnOrBarPosition.Y
+5139
+// aColumnOrBarSize.Height
+2210
+// aColumnOrBarSize.Width
+1964
+// aColumnOrBarTransformation
+1964;0;9967;0;2210;5139;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
+// aColumnOrBarPosition.X
+5055
+// aColumnOrBarPosition.Y
+5082
+// aColumnOrBarSize.Height
+2267
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;5055;0;2267;5082;0;0;1
+/// Series 1 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
+// aColumnOrBarPosition.X
+14878
+// aColumnOrBarPosition.Y
+4421
+// aColumnOrBarSize.Height
+1550
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;14878;0;1550;4421;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
+// aColumnOrBarPosition.X
+9967
+// aColumnOrBarPosition.Y
+3912
+// aColumnOrBarSize.Height
+1227
+// aColumnOrBarSize.Width
+1964
+// aColumnOrBarTransformation
+1964;0;9967;0;1227;3912;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
+// aColumnOrBarPosition.X
+5055
+// aColumnOrBarPosition.Y
+3459
+// aColumnOrBarSize.Height
+1623
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;5055;0;1623;3459;0;0;1
+/// Series 2 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
+// aColumnOrBarPosition.X
+14878
+// aColumnOrBarPosition.Y
+3502
+// aColumnOrBarSize.Height
+919
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;14878;0;919;3502;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
+// aColumnOrBarPosition.X
+9967
+// aColumnOrBarPosition.Y
+2711
+// aColumnOrBarSize.Height
+1201
+// aColumnOrBarSize.Width
+1964
+// aColumnOrBarTransformation
+1964;0;9967;0;1201;2711;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
+// aColumnOrBarPosition.X
+5055
+// aColumnOrBarPosition.Y
+2635
+// aColumnOrBarSize.Height
+824
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;5055;0;824;2635;0;0;1
+/// Series 3 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+2
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
+// aColumnOrBarPosition.X
+14878
+// aColumnOrBarPosition.Y
+1345
+// aColumnOrBarSize.Height
+2157
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;14878;0;2157;1345;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
+// aColumnOrBarPosition.X
+9967
+// aColumnOrBarPosition.Y
+1345
+// aColumnOrBarSize.Height
+1366
+// aColumnOrBarSize.Width
+1964
+// aColumnOrBarTransformation
+1964;0;9967;0;1366;1345;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
+// aColumnOrBarPosition.X
+5055
+// aColumnOrBarPosition.Y
+1345
+// aColumnOrBarSize.Height
+1290
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;5055;0;1290;1345;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columnbarcharttest/stacked_bar_chart.txt b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/stacked_bar_chart.txt
new file mode 100755
index 000000000000..228bc26b81cb
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/stacked_bar_chart.txt
@@ -0,0 +1,162 @@
+// nSeriesCount
+4
+/// Series 0 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+16711807
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+1945
+// aColumnOrBarSize.Height
+800
+// aColumnOrBarSize.Width
+2828
+// aColumnOrBarTransformation
+2828;0;3582;0;800;1945;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+3946
+// aColumnOrBarSize.Height
+801
+// aColumnOrBarSize.Width
+4773
+// aColumnOrBarTransformation
+4773;0;3582;0;801;3946;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
+// aColumnOrBarPosition.X
+3582
+// aColumnOrBarPosition.Y
+5948
+// aColumnOrBarSize.Height
+800
+// aColumnOrBarSize.Width
+2592
+// aColumnOrBarTransformation
+2592;0;3582;0;800;5948;0;0;1
+/// Series 1 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
+// aColumnOrBarPosition.X
+6410
+// aColumnOrBarPosition.Y
+1945
+// aColumnOrBarSize.Height
+800
+// aColumnOrBarSize.Width
+3182
+// aColumnOrBarTransformation
+3182;0;6410;0;800;1945;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
+// aColumnOrBarPosition.X
+8355
+// aColumnOrBarPosition.Y
+3946
+// aColumnOrBarSize.Height
+801
+// aColumnOrBarSize.Width
+2652
+// aColumnOrBarTransformation
+2652;0;8355;0;801;3946;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
+// aColumnOrBarPosition.X
+6174
+// aColumnOrBarPosition.Y
+5948
+// aColumnOrBarSize.Height
+800
+// aColumnOrBarSize.Width
+1857
+// aColumnOrBarTransformation
+1857;0;6174;0;800;5948;0;0;1
+/// Series 2 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+255
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
+// aColumnOrBarPosition.X
+9592
+// aColumnOrBarPosition.Y
+1945
+// aColumnOrBarSize.Height
+800
+// aColumnOrBarSize.Width
+1886
+// aColumnOrBarTransformation
+1886;0;9592;0;800;1945;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
+// aColumnOrBarPosition.X
+11007
+// aColumnOrBarPosition.Y
+3946
+// aColumnOrBarSize.Height
+801
+// aColumnOrBarSize.Width
+2593
+// aColumnOrBarTransformation
+2593;0;11007;0;801;3946;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
+// aColumnOrBarPosition.X
+8031
+// aColumnOrBarPosition.Y
+5948
+// aColumnOrBarSize.Height
+800
+// aColumnOrBarSize.Width
+943
+// aColumnOrBarTransformation
+943;0;8031;0;800;5948;0;0;1
+/// Series 3 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
+// aColumnOrBarPosition.X
+11478
+// aColumnOrBarPosition.Y
+1945
+// aColumnOrBarSize.Height
+800
+// aColumnOrBarSize.Width
+4429
+// aColumnOrBarTransformation
+4429;0;11478;0;800;1945;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
+// aColumnOrBarPosition.X
+13600
+// aColumnOrBarPosition.Y
+3946
+// aColumnOrBarSize.Height
+801
+// aColumnOrBarSize.Width
+2952
+// aColumnOrBarTransformation
+2952;0;13600;0;801;3946;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
+// aColumnOrBarPosition.X
+8974
+// aColumnOrBarPosition.Y
+5948
+// aColumnOrBarSize.Height
+800
+// aColumnOrBarSize.Width
+1476
+// aColumnOrBarTransformation
+1476;0;8974;0;800;5948;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columnbarcharttest/stacked_column_chart.txt b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/stacked_column_chart.txt
new file mode 100755
index 000000000000..0326452589e0
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/reference/columnbarcharttest/stacked_column_chart.txt
@@ -0,0 +1,162 @@
+// nSeriesCount
+4
+/// Series 0 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+1
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+16711807
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
+// aColumnOrBarPosition.X
+14878
+// aColumnOrBarPosition.Y
+6196
+// aColumnOrBarSize.Height
+1153
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;14878;0;1153;6196;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
+// aColumnOrBarPosition.X
+9967
+// aColumnOrBarPosition.Y
+5404
+// aColumnOrBarSize.Height
+1945
+// aColumnOrBarSize.Width
+1964
+// aColumnOrBarTransformation
+1964;0;9967;0;1945;5404;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
+// aColumnOrBarPosition.X
+5055
+// aColumnOrBarPosition.Y
+6292
+// aColumnOrBarSize.Height
+1057
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;5055;0;1057;6292;0;0;1
+/// Series 1 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
+// aColumnOrBarPosition.X
+14878
+// aColumnOrBarPosition.Y
+4899
+// aColumnOrBarSize.Height
+1297
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;14878;0;1297;4899;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
+// aColumnOrBarPosition.X
+9967
+// aColumnOrBarPosition.Y
+4323
+// aColumnOrBarSize.Height
+1081
+// aColumnOrBarSize.Width
+1964
+// aColumnOrBarTransformation
+1964;0;9967;0;1081;4323;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
+// aColumnOrBarPosition.X
+5055
+// aColumnOrBarPosition.Y
+5536
+// aColumnOrBarSize.Height
+756
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;5055;0;756;5536;0;0;1
+/// Series 2 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+4
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
+// aColumnOrBarPosition.X
+14878
+// aColumnOrBarPosition.Y
+4131
+// aColumnOrBarSize.Height
+768
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;14878;0;768;4131;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
+// aColumnOrBarPosition.X
+9967
+// aColumnOrBarPosition.Y
+3266
+// aColumnOrBarSize.Height
+1057
+// aColumnOrBarSize.Width
+1964
+// aColumnOrBarTransformation
+1964;0;9967;0;1057;3266;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
+// aColumnOrBarPosition.X
+5055
+// aColumnOrBarPosition.Y
+5151
+// aColumnOrBarSize.Height
+385
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;5055;0;385;5151;0;0;1
+/// Series 3 ColumnsOrBars
+// nColumnOrBarCountInSeries
+3
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillStyle)
+2
+// static_cast<sal_Int32>(aSeriesColumnOrBarFillColor)
+10079487
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
+// aColumnOrBarPosition.X
+14878
+// aColumnOrBarPosition.Y
+2326
+// aColumnOrBarSize.Height
+1805
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;14878;0;1805;2326;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
+// aColumnOrBarPosition.X
+9967
+// aColumnOrBarPosition.Y
+2063
+// aColumnOrBarSize.Height
+1203
+// aColumnOrBarSize.Width
+1964
+// aColumnOrBarTransformation
+1964;0;9967;0;1203;2063;0;0;1
+/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
+// aColumnOrBarPosition.X
+5055
+// aColumnOrBarPosition.Y
+4550
+// aColumnOrBarSize.Height
+601
+// aColumnOrBarSize.Width
+1965
+// aColumnOrBarTransformation
+1965;0;5055;0;601;4550;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columncharttest/column_chart_small_spacing.txt b/chart2/qa/extras/chart2dump/reference/columncharttest/column_chart_small_spacing.txt
deleted file mode 100755
index 4790ceb66023..000000000000
--- a/chart2/qa/extras/chart2dump/reference/columncharttest/column_chart_small_spacing.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-// nSeriesCount
-4
-/// Series 0 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-1
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-16711807
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
-// aColumnPosition.X
-13522
-// aColumnPosition.Y
-4147
-// aColumnSize.Height
-3202
-// aColumnSize.Width
-1169
-// aColumnTransformation
-1169;0;13522;0;3202;4147;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
-// aColumnPosition.X
-8610
-// aColumnPosition.Y
-1946
-// aColumnSize.Height
-5403
-// aColumnSize.Width
-1170
-// aColumnTransformation
-1170;0;8610;0;5403;1946;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
-// aColumnPosition.X
-3698
-// aColumnPosition.Y
-4414
-// aColumnSize.Height
-2935
-// aColumnSize.Width
-1170
-// aColumnTransformation
-1170;0;3698;0;2935;4414;0;0;1
-/// Series 1 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-4
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
-// aColumnPosition.X
-14691
-// aColumnPosition.Y
-3747
-// aColumnSize.Height
-3602
-// aColumnSize.Width
-1170
-// aColumnTransformation
-1170;0;14691;0;3602;3747;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
-// aColumnPosition.X
-9780
-// aColumnPosition.Y
-4347
-// aColumnSize.Height
-3002
-// aColumnSize.Width
-1169
-// aColumnTransformation
-1169;0;9780;0;3002;4347;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
-// aColumnPosition.X
-4868
-// aColumnPosition.Y
-5247
-// aColumnSize.Height
-2102
-// aColumnSize.Width
-1169
-// aColumnTransformation
-1169;0;4868;0;2102;5247;0;0;1
-/// Series 2 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-3
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
-// aColumnPosition.X
-15861
-// aColumnPosition.Y
-5214
-// aColumnSize.Height
-2135
-// aColumnSize.Width
-1169
-// aColumnTransformation
-1169;0;15861;0;2135;5214;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
-// aColumnPosition.X
-10949
-// aColumnPosition.Y
-4414
-// aColumnSize.Height
-2935
-// aColumnSize.Width
-1169
-// aColumnTransformation
-1169;0;10949;0;2935;4414;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
-// aColumnPosition.X
-6037
-// aColumnPosition.Y
-6281
-// aColumnSize.Height
-1068
-// aColumnSize.Width
-1170
-// aColumnTransformation
-1170;0;6037;0;1068;6281;0;0;1
-/// Series 3 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-2
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
-// aColumnPosition.X
-17030
-// aColumnPosition.Y
-2335
-// aColumnSize.Height
-5014
-// aColumnSize.Width
-1170
-// aColumnTransformation
-1170;0;17030;0;5014;2335;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
-// aColumnPosition.X
-12118
-// aColumnPosition.Y
-4006
-// aColumnSize.Height
-3343
-// aColumnSize.Width
-1170
-// aColumnTransformation
-1170;0;12118;0;3343;4006;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
-// aColumnPosition.X
-7207
-// aColumnPosition.Y
-5677
-// aColumnSize.Height
-1672
-// aColumnSize.Width
-1169
-// aColumnTransformation
-1169;0;7207;0;1672;5677;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columncharttest/normal_column_chart.txt b/chart2/qa/extras/chart2dump/reference/columncharttest/normal_column_chart.txt
deleted file mode 100755
index b5e7975ae17e..000000000000
--- a/chart2/qa/extras/chart2dump/reference/columncharttest/normal_column_chart.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-// nSeriesCount
-4
-/// Series 0 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-1
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-16711807
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
-// aColumnPosition.X
-14075
-// aColumnPosition.Y
-4147
-// aColumnSize.Height
-3202
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;14075;0;3202;4147;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
-// aColumnPosition.X
-9163
-// aColumnPosition.Y
-1946
-// aColumnSize.Height
-5403
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;9163;0;5403;1946;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
-// aColumnPosition.X
-4251
-// aColumnPosition.Y
-4414
-// aColumnSize.Height
-2935
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;4251;0;2935;4414;0;0;1
-/// Series 1 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-4
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
-// aColumnPosition.X
-14968
-// aColumnPosition.Y
-3747
-// aColumnSize.Height
-3602
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;14968;0;3602;3747;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
-// aColumnPosition.X
-10056
-// aColumnPosition.Y
-4347
-// aColumnSize.Height
-3002
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;10056;0;3002;4347;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
-// aColumnPosition.X
-5144
-// aColumnPosition.Y
-5247
-// aColumnSize.Height
-2102
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;5144;0;2102;5247;0;0;1
-/// Series 2 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-4
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
-// aColumnPosition.X
-15861
-// aColumnPosition.Y
-5214
-// aColumnSize.Height
-2135
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;15861;0;2135;5214;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
-// aColumnPosition.X
-10949
-// aColumnPosition.Y
-4414
-// aColumnSize.Height
-2935
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;10949;0;2935;4414;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
-// aColumnPosition.X
-6037
-// aColumnPosition.Y
-6281
-// aColumnSize.Height
-1068
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;6037;0;1068;6281;0;0;1
-/// Series 3 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-4
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
-// aColumnPosition.X
-16754
-// aColumnPosition.Y
-2335
-// aColumnSize.Height
-5014
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;16754;0;5014;2335;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
-// aColumnPosition.X
-11842
-// aColumnPosition.Y
-4006
-// aColumnSize.Height
-3343
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;11842;0;3343;4006;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
-// aColumnPosition.X
-6930
-// aColumnPosition.Y
-5677
-// aColumnSize.Height
-1672
-// aColumnSize.Width
-893
-// aColumnTransformation
-893;0;6930;0;1672;5677;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columncharttest/percent_stacked_column_chart.txt b/chart2/qa/extras/chart2dump/reference/columncharttest/percent_stacked_column_chart.txt
deleted file mode 100755
index c2fcde73236a..000000000000
--- a/chart2/qa/extras/chart2dump/reference/columncharttest/percent_stacked_column_chart.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-// nSeriesCount
-4
-/// Series 0 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-1
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-16711807
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
-// aColumnPosition.X
-14878
-// aColumnPosition.Y
-5971
-// aColumnSize.Height
-1378
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;14878;0;1378;5971;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
-// aColumnPosition.X
-9967
-// aColumnPosition.Y
-5139
-// aColumnSize.Height
-2210
-// aColumnSize.Width
-1964
-// aColumnTransformation
-1964;0;9967;0;2210;5139;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
-// aColumnPosition.X
-5055
-// aColumnPosition.Y
-5082
-// aColumnSize.Height
-2267
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;5055;0;2267;5082;0;0;1
-/// Series 1 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-4
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
-// aColumnPosition.X
-14878
-// aColumnPosition.Y
-4421
-// aColumnSize.Height
-1550
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;14878;0;1550;4421;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
-// aColumnPosition.X
-9967
-// aColumnPosition.Y
-3912
-// aColumnSize.Height
-1227
-// aColumnSize.Width
-1964
-// aColumnTransformation
-1964;0;9967;0;1227;3912;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
-// aColumnPosition.X
-5055
-// aColumnPosition.Y
-3459
-// aColumnSize.Height
-1623
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;5055;0;1623;3459;0;0;1
-/// Series 2 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-3
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
-// aColumnPosition.X
-14878
-// aColumnPosition.Y
-3502
-// aColumnSize.Height
-919
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;14878;0;919;3502;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
-// aColumnPosition.X
-9967
-// aColumnPosition.Y
-2711
-// aColumnSize.Height
-1201
-// aColumnSize.Width
-1964
-// aColumnTransformation
-1964;0;9967;0;1201;2711;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
-// aColumnPosition.X
-5055
-// aColumnPosition.Y
-2635
-// aColumnSize.Height
-824
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;5055;0;824;2635;0;0;1
-/// Series 3 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-2
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
-// aColumnPosition.X
-14878
-// aColumnPosition.Y
-1345
-// aColumnSize.Height
-2157
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;14878;0;2157;1345;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
-// aColumnPosition.X
-9967
-// aColumnPosition.Y
-1345
-// aColumnSize.Height
-1366
-// aColumnSize.Width
-1964
-// aColumnTransformation
-1964;0;9967;0;1366;1345;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
-// aColumnPosition.X
-5055
-// aColumnPosition.Y
-1345
-// aColumnSize.Height
-1290
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;5055;0;1290;1345;0;0;1
diff --git a/chart2/qa/extras/chart2dump/reference/columncharttest/stacked_column_chart.txt b/chart2/qa/extras/chart2dump/reference/columncharttest/stacked_column_chart.txt
deleted file mode 100755
index 3e2f4b3c39f5..000000000000
--- a/chart2/qa/extras/chart2dump/reference/columncharttest/stacked_column_chart.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-// nSeriesCount
-4
-/// Series 0 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-1
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-16711807
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2
-// aColumnPosition.X
-14878
-// aColumnPosition.Y
-6196
-// aColumnSize.Height
-1153
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;14878;0;1153;6196;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1
-// aColumnPosition.X
-9967
-// aColumnPosition.Y
-5404
-// aColumnSize.Height
-1945
-// aColumnSize.Width
-1964
-// aColumnTransformation
-1964;0;9967;0;1945;5404;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0
-// aColumnPosition.X
-5055
-// aColumnPosition.Y
-6292
-// aColumnSize.Height
-1057
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;5055;0;1057;6292;0;0;1
-/// Series 1 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-4
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2
-// aColumnPosition.X
-14878
-// aColumnPosition.Y
-4899
-// aColumnSize.Height
-1297
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;14878;0;1297;4899;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1
-// aColumnPosition.X
-9967
-// aColumnPosition.Y
-4323
-// aColumnSize.Height
-1081
-// aColumnSize.Width
-1964
-// aColumnTransformation
-1964;0;9967;0;1081;4323;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0
-// aColumnPosition.X
-5055
-// aColumnPosition.Y
-5536
-// aColumnSize.Height
-756
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;5055;0;756;5536;0;0;1
-/// Series 2 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-4
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2
-// aColumnPosition.X
-14878
-// aColumnPosition.Y
-4131
-// aColumnSize.Height
-768
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;14878;0;768;4131;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1
-// aColumnPosition.X
-9967
-// aColumnPosition.Y
-3266
-// aColumnSize.Height
-1057
-// aColumnSize.Width
-1964
-// aColumnTransformation
-1964;0;9967;0;1057;3266;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0
-// aColumnPosition.X
-5055
-// aColumnPosition.Y
-5151
-// aColumnSize.Height
-385
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;5055;0;385;5151;0;0;1
-/// Series 3 Columns
-// nColumnCountInSeries
-3
-// static_cast<sal_Int32>(aSeriesColumnFillStyle)
-2
-// static_cast<sal_Int32>(aSeriesColumnFillColor)
-10079487
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2
-// aColumnPosition.X
-14878
-// aColumnPosition.Y
-2326
-// aColumnSize.Height
-1805
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;14878;0;1805;2326;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1
-// aColumnPosition.X
-9967
-// aColumnPosition.Y
-2063
-// aColumnSize.Height
-1203
-// aColumnSize.Width
-1964
-// aColumnTransformation
-1964;0;9967;0;1203;2063;0;0;1
-/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0
-// aColumnPosition.X
-5055
-// aColumnPosition.Y
-4550
-// aColumnSize.Height
-601
-// aColumnSize.Width
-1965
-// aColumnTransformation
-1965;0;5055;0;601;4550;0;0;1