summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-02-16 19:58:42 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-02-16 19:25:20 +0000
commitbecde82a91127ac57129e350f3e68081e1908e5e (patch)
treed2c90e8baf1273a6aaaa3873ddacd6858d0b06b9 /chart2
parentc995531d8a7c97f684f2e65707c7b3f87a0ba372 (diff)
ChartDumpTest: Convert failing tests' documents from ods to odp
Change-Id: Iac7bfd3d22e2186b90c525a6b5bc2a1605ae9aa3 Reviewed-on: https://gerrit.libreoffice.org/34338 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'chart2')
-rwxr-xr-xchart2/qa/extras/chart2dump/chart2dump.cxx43
-rwxr-xr-xchart2/qa/extras/chart2dump/data/axis_special_positioning.odpbin27406 -> 25184 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.odpbin0 -> 21107 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.odsbin24646 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.odpbin0 -> 21109 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.odsbin24938 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/chartwall_custom_positioning.odpbin0 -> 22877 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/chartwall_custom_positioning.odsbin29332 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/custom_legend_position.odpbin0 -> 16252 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/custom_legend_position.odsbin13980 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/default_formated_axis.odpbin27484 -> 26147 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/default_formated_axis.odsbin29536 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/formated_axis_labels.odpbin0 -> 15281 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/formated_axis_labels.odsbin29615 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/formated_axis_lines.odpbin21425 -> 23977 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/legend_on_bottom.odpbin0 -> 16437 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/legend_on_bottom.odsbin14040 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/legend_on_left_side.odpbin0 -> 16124 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/legend_on_left_side.odsbin14004 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/legend_on_right_side.odpbin0 -> 14069 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/legend_on_right_side.odsbin13455 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/legend_on_top.odpbin0 -> 16302 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/legend_on_top.odsbin14012 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/many_legend_entries.odpbin0 -> 20684 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/many_legend_entries.odsbin15835 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/multiple_categories.odpbin0 -> 21173 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/percent_stacked_column_chart.odpbin0 -> 23349 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/rotated_axis_labels.odpbin20942 -> 23364 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/data/rotated_axis_labels.odsbin30053 -> 0 bytes
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt16
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt16
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt16
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt16
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt134
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/axislabeltest/formated_axis_labels.txt234
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/axislabeltest/percent_stacked_column_chart.txt136
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/axislabeltest/rotated_axis_labels.txt64
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_with_titles.txt10
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_without_titles.txt10
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt10
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/legendtest/custom_legend_position.txt32
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/legendtest/legend_on_bottom.txt28
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/legendtest/legend_on_left_side.txt18
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/legendtest/legend_on_right_side.txt16
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/legendtest/legend_on_top.txt18
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/legendtest/many_legend_entries.txt62
-rwxr-xr-xchart2/qa/extras/chart2dump/reference/legendtest/multiple_categories.txt56
47 files changed, 525 insertions, 410 deletions
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index db18512b5f58..012942321155 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -28,7 +28,7 @@
#if defined(MACOSX)
#define INT_EPS 200.1
-#elif defined(UNX)
+#elif defined(X86)
#define INT_EPS 2.1
#else
#define INT_EPS 0.1
@@ -398,20 +398,21 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
{
const std::vector<OUString> aTestFiles =
{
- "legend_on_right_side.ods",
- "legend_on_bottom.ods",
- "legend_on_left_side.ods",
- "legend_on_top.ods",
- "many_legend_entries.ods",
- "custom_legend_position.ods",
- "multiple_categories.ods"
+ "legend_on_right_side.odp",
+ "legend_on_bottom.odp",
+ "legend_on_left_side.odp",
+ "legend_on_top.odp",
+ "many_legend_entries.odp",
+ "custom_legend_position.odp",
+ "multiple_categories.odp"
};
for (const OUString& aTestFile : aTestFiles)
{
setTestFileName(aTestFile);
load(getTestFileDirName(), getTestFileName());
- uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
+ CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY);
@@ -444,8 +445,8 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
// Check position and size
awt::Point aLegendEntryPosition = xLegendEntry->getPosition();
- CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendEntryPosition.X, 76.1);
- CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendEntryPosition.Y, 38.1);
+ CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendEntryPosition.X, INT_EPS);
+ CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendEntryPosition.Y, INT_EPS);
awt::Size aLegendEntrySize = xLegendEntry->getSize();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendEntrySize.Height, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendEntrySize.Width, INT_EPS);
@@ -645,17 +646,18 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false)
{
const std::vector<OUString> aTestFiles =
{
- "default_formated_axis.ods",
- "rotated_axis_labels.ods",
- "formated_axis_labels.ods",
- "percent_stacked_column_chart.ods",
+ "default_formated_axis.odp",
+ "rotated_axis_labels.odp",
+ "formated_axis_labels.odp",
+ "percent_stacked_column_chart.odp",
};
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
load(getTestFileDirName(), getTestFileName());
- uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
+ CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY);
@@ -801,16 +803,17 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false)
{
const std::vector<OUString> aTestFiles =
{
- "chartwall_auto_adjust_with_titles.ods",
- "chartwall_auto_adjust_without_titles.ods",
- "chartwall_custom_positioning.ods"
+ "chartwall_auto_adjust_with_titles.odp",
+ "chartwall_auto_adjust_without_titles.odp",
+ "chartwall_custom_positioning.odp"
};
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
load(getTestFileDirName(), getTestFileName());
- uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
+ CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY);
diff --git a/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp b/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp
index 568dd5ce569a..5ffd093e9eb5 100755
--- a/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp
+++ b/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.odp b/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.odp
new file mode 100755
index 000000000000..848974a41f44
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.ods b/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.ods
deleted file mode 100755
index dfd750a40fc9..000000000000
--- a/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.odp b/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.odp
new file mode 100755
index 000000000000..59983be16dd9
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.ods b/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.ods
deleted file mode 100755
index 925729f1029c..000000000000
--- a/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.odp b/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.odp
new file mode 100755
index 000000000000..fb520eec5bf9
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.ods b/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.ods
deleted file mode 100755
index aa7b797c8928..000000000000
--- a/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/custom_legend_position.odp b/chart2/qa/extras/chart2dump/data/custom_legend_position.odp
new file mode 100755
index 000000000000..085a24f7cc17
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/custom_legend_position.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/custom_legend_position.ods b/chart2/qa/extras/chart2dump/data/custom_legend_position.ods
deleted file mode 100755
index 8a8fca88d382..000000000000
--- a/chart2/qa/extras/chart2dump/data/custom_legend_position.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/default_formated_axis.odp b/chart2/qa/extras/chart2dump/data/default_formated_axis.odp
index 869f7e3e89e9..04e1d671cf22 100755
--- a/chart2/qa/extras/chart2dump/data/default_formated_axis.odp
+++ b/chart2/qa/extras/chart2dump/data/default_formated_axis.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/default_formated_axis.ods b/chart2/qa/extras/chart2dump/data/default_formated_axis.ods
deleted file mode 100755
index 487fcfc98ef3..000000000000
--- a/chart2/qa/extras/chart2dump/data/default_formated_axis.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_labels.odp b/chart2/qa/extras/chart2dump/data/formated_axis_labels.odp
new file mode 100755
index 000000000000..8657b18d3658
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/formated_axis_labels.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_labels.ods b/chart2/qa/extras/chart2dump/data/formated_axis_labels.ods
deleted file mode 100755
index 77ba015c9b12..000000000000
--- a/chart2/qa/extras/chart2dump/data/formated_axis_labels.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp b/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp
index f6a1cc8a8fb0..f612160b6b1a 100755
--- a/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp
+++ b/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/legend_on_bottom.odp b/chart2/qa/extras/chart2dump/data/legend_on_bottom.odp
new file mode 100755
index 000000000000..0c9cd2d657ac
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/legend_on_bottom.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/legend_on_bottom.ods b/chart2/qa/extras/chart2dump/data/legend_on_bottom.ods
deleted file mode 100755
index 9abb8a8685e1..000000000000
--- a/chart2/qa/extras/chart2dump/data/legend_on_bottom.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/legend_on_left_side.odp b/chart2/qa/extras/chart2dump/data/legend_on_left_side.odp
new file mode 100755
index 000000000000..1fae42f2d48e
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/legend_on_left_side.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/legend_on_left_side.ods b/chart2/qa/extras/chart2dump/data/legend_on_left_side.ods
deleted file mode 100755
index 38115ace06e8..000000000000
--- a/chart2/qa/extras/chart2dump/data/legend_on_left_side.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/legend_on_right_side.odp b/chart2/qa/extras/chart2dump/data/legend_on_right_side.odp
new file mode 100755
index 000000000000..d15698447ad1
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/legend_on_right_side.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/legend_on_right_side.ods b/chart2/qa/extras/chart2dump/data/legend_on_right_side.ods
deleted file mode 100755
index a41b6585f8f6..000000000000
--- a/chart2/qa/extras/chart2dump/data/legend_on_right_side.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/legend_on_top.odp b/chart2/qa/extras/chart2dump/data/legend_on_top.odp
new file mode 100755
index 000000000000..283e1d60c682
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/legend_on_top.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/legend_on_top.ods b/chart2/qa/extras/chart2dump/data/legend_on_top.ods
deleted file mode 100755
index 2b20ec356ad9..000000000000
--- a/chart2/qa/extras/chart2dump/data/legend_on_top.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/many_legend_entries.odp b/chart2/qa/extras/chart2dump/data/many_legend_entries.odp
new file mode 100755
index 000000000000..47a6fbc24145
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/many_legend_entries.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/many_legend_entries.ods b/chart2/qa/extras/chart2dump/data/many_legend_entries.ods
deleted file mode 100755
index 0dc5114418bf..000000000000
--- a/chart2/qa/extras/chart2dump/data/many_legend_entries.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/multiple_categories.odp b/chart2/qa/extras/chart2dump/data/multiple_categories.odp
new file mode 100755
index 000000000000..38ad572148a2
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/multiple_categories.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/percent_stacked_column_chart.odp b/chart2/qa/extras/chart2dump/data/percent_stacked_column_chart.odp
new file mode 100755
index 000000000000..46d977b7d985
--- /dev/null
+++ b/chart2/qa/extras/chart2dump/data/percent_stacked_column_chart.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp
index 4314c455da45..cb3ae37e92a4 100755
--- a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp
+++ b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods
deleted file mode 100755
index c43ea445aec8..000000000000
--- a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods
+++ /dev/null
Binary files differ
diff --git a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
index 4c444c9346d0..e34ef3c10422 100755
--- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
+++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt
@@ -1,14 +1,14 @@
/// CID/D=0:CS=0:Axis=0,0
// aAxisPosition.X
-3469
+5112
// aAxisPosition.Y
-1303
+1990
// aAxisSize.Height
300
// aAxisSize.Width
-11625
+17133
// aAxisTransformation
-11626;0;3469;0;301;1303;0;0;1
+17134;0;5112;0;301;1990;0;0;1
// nAxisGeometriesCount
2
// sAxisLineDash
@@ -19,15 +19,15 @@
0
/// CID/D=0:CS=0:Axis=1,0
// aAxisPosition.X
-15094
+22245
// aAxisPosition.Y
-1453
+2140
// aAxisSize.Height
-5431
+8005
// aAxisSize.Width
150
// aAxisTransformation
-151;0;15094;0;5432;1453;0;0;1
+151;0;22245;0;8006;2140;0;0;1
// nAxisGeometriesCount
3
// sAxisLineDash
diff --git a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt
index 59e382192ed8..46eec6d76690 100755
--- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt
+++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt
@@ -1,14 +1,14 @@
/// CID/D=0:CS=0:Axis=0,0
// aAxisPosition.X
-3486
+5393
// aAxisPosition.Y
-7398
+11883
// aAxisSize.Height
150
// aAxisSize.Width
-11283
+17455
// aAxisTransformation
-11284;0;3486;0;151;7398;0;0;1
+17456;0;5393;0;151;11883;0;0;1
// nAxisGeometriesCount
2
// sAxisLineDash
@@ -19,15 +19,15 @@
0
/// CID/D=0:CS=0:Axis=1,0
// aAxisPosition.X
-3336
+5243
// aAxisPosition.Y
-1561
+2507
// aAxisSize.Height
-5837
+9376
// aAxisSize.Width
150
// aAxisTransformation
-151;0;3336;0;5838;1561;0;0;1
+151;0;5243;0;9377;2507;0;0;1
// nAxisGeometriesCount
2
// sAxisLineDash
diff --git a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt
index d7591c10a49e..980e2592dafe 100755
--- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt
+++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt
@@ -1,14 +1,14 @@
/// CID/D=0:CS=0:Axis=0,0
// aAxisPosition.X
-2864
+3852
// aAxisPosition.Y
-7221
+9713
// aAxisSize.Height
150
// aAxisSize.Width
-11786
+15854
// aAxisTransformation
-11787;0;2864;0;151;7221;0;0;1
+15855;0;3852;0;151;9713;0;0;1
// nAxisGeometriesCount
2
// sAxisLineDash
@@ -19,15 +19,15 @@
100
/// CID/D=0:CS=0:Axis=1,0
// aAxisPosition.X
-2714
+3702
// aAxisPosition.Y
-1525
+2051
// aAxisSize.Height
-5696
+7662
// aAxisSize.Width
150
// aAxisTransformation
-151;0;2714;0;5697;1525;0;0;1
+151;0;3702;0;7663;2051;0;0;1
// nAxisGeometriesCount
2
// sAxisLineDash
diff --git a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt
index dffbfa06f19d..151ab21acb3d 100755
--- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt
+++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt
@@ -1,14 +1,14 @@
/// CID/D=0:CS=0:Axis=0,0
// aAxisPosition.X
-2854
+3798
// aAxisPosition.Y
-7408
+9860
// aAxisSize.Height
150
// aAxisSize.Width
-12330
+16412
// aAxisTransformation
-12331;0;2854;0;151;7408;0;0;1
+16413;0;3798;0;151;9860;0;0;1
// nAxisGeometriesCount
2
// sAxisLineDash
@@ -19,15 +19,15 @@
0
/// CID/D=0:CS=0:Axis=1,0
// aAxisPosition.X
-2704
+3648
// aAxisPosition.Y
-1564
+2082
// aAxisSize.Height
-5844
+7778
// aAxisSize.Width
150
// aAxisTransformation
-151;0;2704;0;5845;1564;0;0;1
+151;0;3648;0;7779;2082;0;0;1
// nAxisGeometriesCount
2
// sAxisLineDash
diff --git a/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt b/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt
index 836dcfe7022d..e8ec2153f415 100755
--- a/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt
+++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt
@@ -4,15 +4,15 @@
// xLabel->getString()
1. quarter
// aLabelPosition.X
-4586
+6846
// aLabelPosition.Y
-7770
+12133
// aLabelSize.Height
345
// aLabelSize.Width
1457
// aLabelTransformation
-1458;0;4586;0;346;7770;0;0;1
+1458;0;6846;0;346;12133;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -20,15 +20,15 @@
// xLabel->getString()
2. quarter
// aLabelPosition.X
-8196
+11210
// aLabelPosition.Y
-7770
+12133
// aLabelSize.Height
345
// aLabelSize.Width
1457
// aLabelTransformation
-1458;0;8196;0;346;7770;0;0;1
+1458;0;11210;0;346;12133;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -36,15 +36,15 @@
// xLabel->getString()
3. quarter
// aLabelPosition.X
-11806
+15574
// aLabelPosition.Y
-7770
+12133
// aLabelSize.Height
345
// aLabelSize.Width
1457
// aLabelTransformation
-1458;0;11806;0;346;7770;0;0;1
+1458;0;15574;0;346;12133;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -52,50 +52,98 @@
// xLabel->getString()
4. quarter
// aLabelPosition.X
-15416
+19938
// aLabelPosition.Y
-7770
+12133
// aLabelSize.Height
345
// aLabelSize.Width
1457
// aLabelTransformation
-1458;0;15416;0;346;7770;0;0;1
+1458;0;19938;0;346;12133;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
/// CID/D=0:CS=0:Axis=1,0
// nAxisLabelsCount
-8
+11
// xLabel->getString()
- Ft
// aLabelPosition.X
-2518
+4401
// aLabelPosition.Y
-7348
+11711
// aLabelSize.Height
345
// aLabelSize.Width
743
// aLabelTransformation
-744;0;2518;0;346;7348;0;0;1
+744;0;4401;0;346;11711;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-5,000,000 Ft
+2,000,000 Ft
// aLabelPosition.X
-1116
+2999
// aLabelPosition.Y
-6500
+10773
// aLabelSize.Height
345
// aLabelSize.Width
2145
// aLabelTransformation
-2146;0;1116;0;346;6500;0;0;1
+2146;0;2999;0;346;10773;0;0;1
+// static_cast<sal_Int32>(aLabelFontColor)
+0
+// fLabelFontHeight
+10
+// xLabel->getString()
+4,000,000 Ft
+// aLabelPosition.X
+2999
+// aLabelPosition.Y
+9835
+// aLabelSize.Height
+345
+// aLabelSize.Width
+2145
+// aLabelTransformation
+2146;0;2999;0;346;9835;0;0;1
+// static_cast<sal_Int32>(aLabelFontColor)
+0
+// fLabelFontHeight
+10
+// xLabel->getString()
+6,000,000 Ft
+// aLabelPosition.X
+2999
+// aLabelPosition.Y
+8898
+// aLabelSize.Height
+345
+// aLabelSize.Width
+2145
+// aLabelTransformation
+2146;0;2999;0;346;8898;0;0;1
+// static_cast<sal_Int32>(aLabelFontColor)
+0
+// fLabelFontHeight
+10
+// xLabel->getString()
+8,000,000 Ft
+// aLabelPosition.X
+2999
+// aLabelPosition.Y
+7960
+// aLabelSize.Height
+345
+// aLabelSize.Width
+2145
+// aLabelTransformation
+2146;0;2999;0;346;7960;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -103,95 +151,95 @@
// xLabel->getString()
10,000,000 Ft
// aLabelPosition.X
-930
+2813
// aLabelPosition.Y
-5653
+7023
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2332;0;930;0;346;5653;0;0;1
+2332;0;2813;0;346;7023;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-15,000,000 Ft
+12,000,000 Ft
// aLabelPosition.X
-930
+2813
// aLabelPosition.Y
-4805
+6085
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2332;0;930;0;346;4805;0;0;1
+2332;0;2813;0;346;6085;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-20,000,000 Ft
+14,000,000 Ft
// aLabelPosition.X
-930
+2813
// aLabelPosition.Y
-3958
+5147
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2332;0;930;0;346;3958;0;0;1
+2332;0;2813;0;346;5147;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-25,000,000 Ft
+16,000,000 Ft
// aLabelPosition.X
-930
+2813
// aLabelPosition.Y
-3110
+4210
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2332;0;930;0;346;3110;0;0;1
+2332;0;2813;0;346;4210;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-30,000,000 Ft
+18,000,000 Ft
// aLabelPosition.X
-930
+2813
// aLabelPosition.Y
-2263
+3272
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2332;0;930;0;346;2263;0;0;1
+2332;0;2813;0;346;3272;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-35,000,000 Ft
+20,000,000 Ft
// aLabelPosition.X
-930
+2813
// aLabelPosition.Y
-1416
+2335
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2332;0;930;0;346;1416;0;0;1
+2332;0;2813;0;346;2335;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
diff --git a/chart2/qa/extras/chart2dump/reference/axislabeltest/formated_axis_labels.txt b/chart2/qa/extras/chart2dump/reference/axislabeltest/formated_axis_labels.txt
index ed290d59cc1e..072725946f0d 100755
--- a/chart2/qa/extras/chart2dump/reference/axislabeltest/formated_axis_labels.txt
+++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/formated_axis_labels.txt
@@ -4,195 +4,243 @@
// xLabel->getString()
1. quarter
// aLabelPosition.X
-4932
+5781
// aLabelPosition.Y
-7770
+13076
// aLabelSize.Height
-292
+451
// aLabelSize.Width
-1246
+1775
// aLabelTransformation
-1247;0;4932;0;293;7770;0;0;1
+1776;0;5781;0;452;13076;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-16711680
+8388352
// fLabelFontHeight
-8
+12
// xLabel->getString()
2. quarter
// aLabelPosition.X
-8705
+10756
// aLabelPosition.Y
-7770
+13076
// aLabelSize.Height
-292
+451
// aLabelSize.Width
-1246
+1775
// aLabelTransformation
-1247;0;8705;0;293;7770;0;0;1
+1776;0;10756;0;452;13076;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-16711680
+8388352
// fLabelFontHeight
-8
+12
// xLabel->getString()
-3. quarter
+2. quarter
// aLabelPosition.X
-12478
+15731
// aLabelPosition.Y
-7770
+13076
// aLabelSize.Height
-292
+451
// aLabelSize.Width
-1246
+1775
// aLabelTransformation
-1247;0;12478;0;293;7770;0;0;1
+1776;0;15731;0;452;13076;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-16711680
+8388352
// fLabelFontHeight
-8
+12
// xLabel->getString()
-4. quarter
+2. quarter
// aLabelPosition.X
-16251
+20706
// aLabelPosition.Y
-7770
+13076
// aLabelSize.Height
-292
+451
// aLabelSize.Width
-1246
+1775
// aLabelTransformation
-1247;0;16251;0;293;7770;0;0;1
+1776;0;20706;0;452;13076;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-16711680
+8388352
// fLabelFontHeight
-8
+12
/// CID/D=0:CS=0:Axis=1,0
// nAxisLabelsCount
-8
+11
// xLabel->getString()
- Ft
// aLabelPosition.X
-2888
+2925
+// aLabelPosition.Y
+12548
+// aLabelSize.Height
+557
+// aLabelSize.Width
+1007
+// aLabelTransformation
+1008;0;2925;0;558;12548;0;0;1
+// static_cast<sal_Int32>(aLabelFontColor)
+16711935
+// fLabelFontHeight
+14
+// xLabel->getString()
+2,000,000 Ft
+// aLabelPosition.X
+782
+// aLabelPosition.Y
+11320
+// aLabelSize.Height
+557
+// aLabelSize.Width
+3150
+// aLabelTransformation
+3151;0;782;0;558;11320;0;0;1
+// static_cast<sal_Int32>(aLabelFontColor)
+16711935
+// fLabelFontHeight
+14
+// xLabel->getString()
+4,000,000 Ft
+// aLabelPosition.X
+782
+// aLabelPosition.Y
+10093
+// aLabelSize.Height
+557
+// aLabelSize.Width
+3150
+// aLabelTransformation
+3151;0;782;0;558;10093;0;0;1
+// static_cast<sal_Int32>(aLabelFontColor)
+16711935
+// fLabelFontHeight
+14
+// xLabel->getString()
+6,000,000 Ft
+// aLabelPosition.X
+782
// aLabelPosition.Y
-7401
+8866
// aLabelSize.Height
-239
+557
// aLabelSize.Width
-531
+3150
// aLabelTransformation
-532;0;2888;0;240;7401;0;0;1
+3151;0;782;0;558;8866;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-32767
+16711935
// fLabelFontHeight
-7
+14
// xLabel->getString()
-5,000,000 Ft
+8,000,000 Ft
// aLabelPosition.X
-1883
+782
// aLabelPosition.Y
-6553
+7639
// aLabelSize.Height
-239
+557
// aLabelSize.Width
-1536
+3150
// aLabelTransformation
-1537;0;1883;0;240;6553;0;0;1
+3151;0;782;0;558;7639;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-32767
+16711935
// fLabelFontHeight
-7
+14
// xLabel->getString()
10,000,000 Ft
// aLabelPosition.X
-1750
+491
// aLabelPosition.Y
-5706
+6411
// aLabelSize.Height
-239
+557
// aLabelSize.Width
-1669
+3441
// aLabelTransformation
-1670;0;1750;0;240;5706;0;0;1
+3442;0;491;0;558;6411;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-32767
+16711935
// fLabelFontHeight
-7
+14
// xLabel->getString()
-15,000,000 Ft
+12,000,000 Ft
// aLabelPosition.X
-1750
+491
// aLabelPosition.Y
-4858
+5184
// aLabelSize.Height
-239
+557
// aLabelSize.Width
-1669
+3441
// aLabelTransformation
-1670;0;1750;0;240;4858;0;0;1
+3442;0;491;0;558;5184;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-32767
+16711935
// fLabelFontHeight
-7
+14
// xLabel->getString()
-20,000,000 Ft
+14,000,000 Ft
// aLabelPosition.X
-1750
+491
// aLabelPosition.Y
-4011
+3957
// aLabelSize.Height
-239
+557
// aLabelSize.Width
-1669
+3441
// aLabelTransformation
-1670;0;1750;0;240;4011;0;0;1
+3442;0;491;0;558;3957;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-32767
+16711935
// fLabelFontHeight
-7
+14
// xLabel->getString()
-25,000,000 Ft
+16,000,000 Ft
// aLabelPosition.X
-1750
+491
// aLabelPosition.Y
-3163
+2730
// aLabelSize.Height
-239
+557
// aLabelSize.Width
-1669
+3441
// aLabelTransformation
-1670;0;1750;0;240;3163;0;0;1
+3442;0;491;0;558;2730;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-32767
+16711935
// fLabelFontHeight
-7
+14
// xLabel->getString()
-30,000,000 Ft
+18,000,000 Ft
// aLabelPosition.X
-1750
+491
// aLabelPosition.Y
-2316
+1503
// aLabelSize.Height
-239
+557
// aLabelSize.Width
-1669
+3441
// aLabelTransformation
-1670;0;1750;0;240;2316;0;0;1
+3442;0;491;0;558;1503;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-32767
+16711935
// fLabelFontHeight
-7
+14
// xLabel->getString()
-35,000,000 Ft
+20,000,000 Ft
// aLabelPosition.X
-1750
+491
// aLabelPosition.Y
-1469
+275
// aLabelSize.Height
-239
+557
// aLabelSize.Width
-1669
+3441
// aLabelTransformation
-1670;0;1750;0;240;1469;0;0;1
+3442;0;491;0;558;275;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
-32767
+16711935
// fLabelFontHeight
-7
+14
diff --git a/chart2/qa/extras/chart2dump/reference/axislabeltest/percent_stacked_column_chart.txt b/chart2/qa/extras/chart2dump/reference/axislabeltest/percent_stacked_column_chart.txt
index b3fca9639e67..058f9948993c 100755
--- a/chart2/qa/extras/chart2dump/reference/axislabeltest/percent_stacked_column_chart.txt
+++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/percent_stacked_column_chart.txt
@@ -1,50 +1,66 @@
/// CID/D=0:CS=0:Axis=0,0
// nAxisLabelsCount
-3
+4
// xLabel->getString()
-1. quarter
+Inkjet
// aLabelPosition.X
-5309
+5996
// aLabelPosition.Y
-7599
+8950
// aLabelSize.Height
345
// aLabelSize.Width
-1457
+849
// aLabelTransformation
-1458;0;5309;0;346;7599;0;0;1
+850;0;5996;0;346;8950;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-2. quarter
+Leser
// aLabelPosition.X
-10221
+10357
// aLabelPosition.Y
-7599
+8950
// aLabelSize.Height
345
// aLabelSize.Width
-1457
+849
// aLabelTransformation
-1458;0;10221;0;346;7599;0;0;1
+850;0;10357;0;346;8950;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-3. quarter
+Multifunction
// aLabelPosition.X
-15133
+14164
// aLabelPosition.Y
-7599
+8950
// aLabelSize.Height
345
// aLabelSize.Width
-1457
+1960
// aLabelTransformation
-1458;0;15133;0;346;7599;0;0;1
+1961;0;14164;0;346;8950;0;0;1
+// static_cast<sal_Int32>(aLabelFontColor)
+0
+// fLabelFontHeight
+10
+// xLabel->getString()
+Picture
+// aLabelPosition.X
+18961
+// aLabelPosition.Y
+8950
+// aLabelSize.Height
+345
+// aLabelSize.Width
+1087
+// aLabelTransformation
+1088;0;18961;0;346;8950;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -53,177 +69,177 @@
// nAxisLabelsCount
11
// xLabel->getString()
-0.00%
+0,00%
// aLabelPosition.X
-2352
+3010
// aLabelPosition.Y
-7177
+8528
// aLabelSize.Height
345
// aLabelSize.Width
981
// aLabelTransformation
-982;0;2352;0;346;7177;0;0;1
+982;0;3010;0;346;8528;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-10.00%
+10,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-6576
+7817
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;6576;0;0;1
+1167;0;2825;0;346;7817;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-20.00%
+20,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-5976
+7106
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;5976;0;0;1
+1167;0;2825;0;346;7106;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-30.00%
+30,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-5375
+6395
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;5375;0;0;1
+1167;0;2825;0;346;6395;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-40.00%
+40,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-4775
+5684
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;4775;0;0;1
+1167;0;2825;0;346;5684;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-50.00%
+50,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-4175
+4974
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;4175;0;0;1
+1167;0;2825;0;346;4974;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-60.00%
+60,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-3574
+4263
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;3574;0;0;1
+1167;0;2825;0;346;4263;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-70.00%
+70,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-2974
+3552
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;2974;0;0;1
+1167;0;2825;0;346;3552;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-80.00%
+80,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-2373
+2841
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;2373;0;0;1
+1167;0;2825;0;346;2841;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-90.00%
+90,00%
// aLabelPosition.X
-2167
+2825
// aLabelPosition.Y
-1773
+2130
// aLabelSize.Height
345
// aLabelSize.Width
1166
// aLabelTransformation
-1167;0;2167;0;346;1773;0;0;1
+1167;0;2825;0;346;2130;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-100.00%
+100,00%
// aLabelPosition.X
-1982
+2640
// aLabelPosition.Y
-1173
+1420
// aLabelSize.Height
345
// aLabelSize.Width
1351
// aLabelTransformation
-1352;0;1982;0;346;1173;0;0;1
+1352;0;2640;0;346;1420;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
diff --git a/chart2/qa/extras/chart2dump/reference/axislabeltest/rotated_axis_labels.txt b/chart2/qa/extras/chart2dump/reference/axislabeltest/rotated_axis_labels.txt
index 5264ac20c2da..ece4ffad861d 100755
--- a/chart2/qa/extras/chart2dump/reference/axislabeltest/rotated_axis_labels.txt
+++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/rotated_axis_labels.txt
@@ -4,15 +4,15 @@
// xLabel->getString()
1. quarter
// aLabelPosition.X
-4677
+4696
// aLabelPosition.Y
-8800
+11140
// aLabelSize.Height
345
// aLabelSize.Width
1457
// aLabelTransformation
-1030.96168696999;244.658946290545;4677;-1030.96168696999;244.658946290545;8800;0;0;1
+1030.96168696999;244.658946290545;4696;-1030.96168696999;244.658946290545;11140;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -20,15 +20,15 @@
// xLabel->getString()
2. quarter
// aLabelPosition.X
-8287
+8799
// aLabelPosition.Y
-8800
+11140
// aLabelSize.Height
345
// aLabelSize.Width
1457
// aLabelTransformation
-1030.96168696999;244.658946290545;8287;-1030.96168696999;244.658946290545;8800;0;0;1
+1030.96168696999;244.658946290545;8799;-1030.96168696999;244.658946290545;11140;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -36,15 +36,15 @@
// xLabel->getString()
3. quarter
// aLabelPosition.X
-11897
+12902
// aLabelPosition.Y
-8800
+11140
// aLabelSize.Height
345
// aLabelSize.Width
1457
// aLabelTransformation
-1030.96168696999;244.658946290545;11897;-1030.96168696999;244.658946290545;8800;0;0;1
+1030.96168696999;244.658946290545;12902;-1030.96168696999;244.658946290545;11140;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -52,15 +52,15 @@
// xLabel->getString()
4. quarter
// aLabelPosition.X
-15507
+17005
// aLabelPosition.Y
-8800
+11140
// aLabelSize.Height
345
// aLabelSize.Width
1457
// aLabelTransformation
-1030.96168696999;244.658946290545;15507;-1030.96168696999;244.658946290545;8800;0;0;1
+1030.96168696999;244.658946290545;17005;-1030.96168696999;244.658946290545;11140;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
@@ -71,79 +71,79 @@
// xLabel->getString()
- Ft
// aLabelPosition.X
-2616
+2831
// aLabelPosition.Y
-7000
+9502
// aLabelSize.Height
345
// aLabelSize.Width
743
// aLabelTransformation
-644.322900415622;-173;2616;372;299.644789709416;7000;0;0;1
+718.648814759067;-89.5513896054722;2831;192.561369556275;334.210335896018;9502;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-10,000,000 Ft
+5,000,000 Ft
// aLabelPosition.X
-1241
+1477
// aLabelPosition.Y
-4723
+7194
// aLabelSize.Height
345
// aLabelSize.Width
-2331
+2145
// aLabelTransformation
-2019.57124162531;-173;1241;1166;299.644789709416;4723;0;0;1
+2072.87682321634;-89.5513896054722;1477;555.425670790009;334.210335896018;7194;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-20,000,000 Ft
+10,000,000 Ft
// aLabelPosition.X
-1241
+1297
// aLabelPosition.Y
-3240
+5202
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2019.57124162531;-173;1241;1166;299.644789709416;3240;0;0;1
+2252.53902690611;-89.5513896054722;1297;603.566013179078;334.210335896018;5202;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-30,000,000 Ft
+15,000,000 Ft
// aLabelPosition.X
-1241
+1297
// aLabelPosition.Y
-1757
+3257
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2019.57124162531;-173;1241;1166;299.644789709416;1757;0;0;1
+2252.53902690611;-89.5513896054722;1297;603.566013179078;334.210335896018;3257;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
10
// xLabel->getString()
-40,000,000 Ft
+20,000,000 Ft
// aLabelPosition.X
-1241
+1297
// aLabelPosition.Y
-274
+1313
// aLabelSize.Height
345
// aLabelSize.Width
2331
// aLabelTransformation
-2019.57124162531;-173;1241;1166;299.644789709416;274;0;0;1
+2252.53902690611;-89.5513896054722;1297;603.566013179078;334.210335896018;1313;0;0;1
// static_cast<sal_Int32>(aLabelFontColor)
0
// fLabelFontHeight
diff --git a/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_with_titles.txt b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_with_titles.txt
index 194552c3f690..e3969c4aec6e 100755
--- a/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_with_titles.txt
+++ b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_with_titles.txt
@@ -1,13 +1,13 @@
// aChartWallPosition.X
-3712
+3911
// aChartWallPosition.Y
-1421
+1622
// aChartWallSize.Height
-5892
+10576
// aChartWallSize.Width
-9708
+19261
// aChartWallTransformation
-9709;0;3712;0;5893;1421;0;0;1
+19262;0;3911;0;10577;1622;0;0;1
// static_cast<sal_Int32>(aChartWallFillStyle)
2
// static_cast<sal_Int32>(aChartWallFillColor)
diff --git a/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_without_titles.txt b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_without_titles.txt
index 8b8f29dd5fb2..d9b7aff58af5 100755
--- a/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_without_titles.txt
+++ b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_without_titles.txt
@@ -1,13 +1,13 @@
// aChartWallPosition.X
-2714
+2877
// aChartWallPosition.Y
-354
+445
// aChartWallSize.Height
-7888
+12303
// aChartWallSize.Width
-12065
+19906
// aChartWallTransformation
-12066;0;2714;0;7889;354;0;0;1
+19907;0;2877;0;12304;445;0;0;1
// static_cast<sal_Int32>(aChartWallFillStyle)
2
// static_cast<sal_Int32>(aChartWallFillColor)
diff --git a/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt
index 325d29379591..20ef25b45628 100755
--- a/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt
+++ b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt
@@ -1,13 +1,13 @@
// aChartWallPosition.X
-6327
+9413
// aChartWallPosition.Y
-1415
+2105
// aChartWallSize.Height
-5949
+8850
// aChartWallSize.Width
-6611
+9836
// aChartWallTransformation
-6612;0;6327;0;5950;1415;0;0;1
+9837;0;9413;0;8851;2105;0;0;1
// static_cast<sal_Int32>(aChartWallFillStyle)
1
// static_cast<sal_Int32>(aChartWallFillColor)
diff --git a/chart2/qa/extras/chart2dump/reference/legendtest/custom_legend_position.txt b/chart2/qa/extras/chart2dump/reference/legendtest/custom_legend_position.txt
index ea72aa8ae0cb..80609caf299d 100755
--- a/chart2/qa/extras/chart2dump/reference/legendtest/custom_legend_position.txt
+++ b/chart2/qa/extras/chart2dump/reference/legendtest/custom_legend_position.txt
@@ -1,23 +1,23 @@
// aLegendPosition.X
-1398
+1989
// aLegendPosition.Y
-396
+563
// aLegendSize.Width
-2144
+3050
// aLegendSize.Height
-2044
+2908
// nLegendEntryCount
4
// aLegendEntryPosition.X
-1781
+2127
// aLegendEntryPosition.Y
-595
+1369
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;1781;0;212;595;0;0;1
+801;0;2127;0;212;1369;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -29,15 +29,15 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
43091
// aLegendEntryPosition.X
-1781
+3521
// aLegendEntryPosition.Y
-1072
+1369
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;1781;0;212;1072;0;0;1
+801;0;3521;0;212;1369;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -49,15 +49,15 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
8388352
// aLegendEntryPosition.X
-1781
+2127
// aLegendEntryPosition.Y
-1549
+2453
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;1781;0;212;1549;0;0;1
+801;0;2127;0;212;2453;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -69,15 +69,15 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
16765728
// aLegendEntryPosition.X
-1781
+3521
// aLegendEntryPosition.Y
-2026
+2453
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;1781;0;212;2026;0;0;1
+801;0;3521;0;212;2453;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
diff --git a/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_bottom.txt b/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_bottom.txt
index af879564a4f1..f7a84c9ff178 100755
--- a/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_bottom.txt
+++ b/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_bottom.txt
@@ -1,7 +1,7 @@
// aLegendPosition.X
-4780
+7630
// aLegendPosition.Y
-8270
+11476
// aLegendSize.Width
6440
// aLegendSize.Height
@@ -9,15 +9,15 @@
// nLegendEntryCount
4
// aLegendEntryPosition.X
-10304
+13154
// aLegendEntryPosition.Y
-8437
+11643
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;10304;0;212;8437;0;0;1
+801;0;13154;0;212;11643;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -29,15 +29,15 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
43091
// aLegendEntryPosition.X
-8694
+11544
// aLegendEntryPosition.Y
-8437
+11643
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;8694;0;212;8437;0;0;1
+801;0;11544;0;212;11643;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -49,15 +49,15 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
8388352
// aLegendEntryPosition.X
-7084
+9934
// aLegendEntryPosition.Y
-8437
+11643
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;7084;0;212;8437;0;0;1
+801;0;9934;0;212;11643;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -69,15 +69,15 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
16765728
// aLegendEntryPosition.X
-5474
+8324
// aLegendEntryPosition.Y
-8437
+11643
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;5474;0;212;8437;0;0;1
+801;0;8324;0;212;11643;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
diff --git a/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_left_side.txt b/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_left_side.txt
index db08d0304104..7356300f0fad 100755
--- a/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_left_side.txt
+++ b/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_left_side.txt
@@ -1,7 +1,7 @@
// aLegendPosition.X
210
// aLegendPosition.Y
-3560
+6060
// aLegendSize.Width
1610
// aLegendSize.Height
@@ -11,13 +11,13 @@
// aLegendEntryPosition.X
326
// aLegendEntryPosition.Y
-3727
+6227
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;326;0;212;3727;0;0;1
+801;0;326;0;212;6227;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -31,13 +31,13 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntryPosition.X
326
// aLegendEntryPosition.Y
-4172
+6672
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;326;0;212;4172;0;0;1
+801;0;326;0;212;6672;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -51,13 +51,13 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntryPosition.X
326
// aLegendEntryPosition.Y
-4617
+7117
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;326;0;212;4617;0;0;1
+801;0;326;0;212;7117;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -71,13 +71,13 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntryPosition.X
326
// aLegendEntryPosition.Y
-5062
+7562
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;326;0;212;5062;0;0;1
+801;0;326;0;212;7562;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
diff --git a/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_right_side.txt b/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_right_side.txt
index bb8dba88aabf..88491ea7c0ad 100755
--- a/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_right_side.txt
+++ b/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_right_side.txt
@@ -1,7 +1,7 @@
// aLegendPosition.X
-14671
+22525
// aLegendPosition.Y
-4000
+6206
// aLegendSize.Width
1127
// aLegendSize.Height
@@ -9,15 +9,15 @@
// nLegendEntryCount
2
// aLegendEntryPosition.X
-14787
+22641
// aLegendEntryPosition.Y
-4167
+6373
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
211
// aLegendEntryTransformation
-212;0;14787;0;212;4167;0;0;1
+212;0;22641;0;212;6373;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
@@ -25,15 +25,15 @@ com.sun.star.drawing.RectangleShape
// static_cast<sal_Int32>(aEntryGeomColor)
17798
// aLegendEntryPosition.X
-14787
+22641
// aLegendEntryPosition.Y
-4612
+6818
// aLegendEntrySize.Height
211
// aLegendEntrySize.Width
211
// aLegendEntryTransformation
-212;0;14787;0;212;4612;0;0;1
+212;0;22641;0;212;6818;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
diff --git a/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_top.txt b/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_top.txt
index 328989144c67..85dff3463040 100755
--- a/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_top.txt
+++ b/chart2/qa/extras/chart2dump/reference/legendtest/legend_on_top.txt
@@ -1,5 +1,5 @@
// aLegendPosition.X
-4780
+7452
// aLegendPosition.Y
185
// aLegendSize.Width
@@ -9,7 +9,7 @@
// nLegendEntryCount
4
// aLegendEntryPosition.X
-4896
+7568
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -17,7 +17,7 @@
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;4896;0;212;352;0;0;1
+801;0;7568;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -29,7 +29,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
43091
// aLegendEntryPosition.X
-6506
+9178
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -37,7 +37,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;6506;0;212;352;0;0;1
+801;0;9178;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -49,7 +49,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
8388352
// aLegendEntryPosition.X
-8116
+10788
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -57,7 +57,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;8116;0;212;352;0;0;1
+801;0;10788;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -69,7 +69,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
16765728
// aLegendEntryPosition.X
-9726
+12398
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -77,7 +77,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;9726;0;212;352;0;0;1
+801;0;12398;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
diff --git a/chart2/qa/extras/chart2dump/reference/legendtest/many_legend_entries.txt b/chart2/qa/extras/chart2dump/reference/legendtest/many_legend_entries.txt
index a912f81a613b..8fc3a62fb0be 100755
--- a/chart2/qa/extras/chart2dump/reference/legendtest/many_legend_entries.txt
+++ b/chart2/qa/extras/chart2dump/reference/legendtest/many_legend_entries.txt
@@ -1,5 +1,5 @@
// aLegendPosition.X
-1474
+4675
// aLegendPosition.Y
185
// aLegendSize.Width
@@ -9,7 +9,7 @@
// nLegendEntryCount
15
// aLegendEntryPosition.X
-1590
+4791
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -17,7 +17,7 @@
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;1590;0;212;352;0;0;1
+801;0;4791;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -29,7 +29,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
43091
// aLegendEntryPosition.X
-3200
+6401
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -37,7 +37,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;3200;0;212;352;0;0;1
+801;0;6401;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -49,7 +49,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
8388352
// aLegendEntryPosition.X
-4810
+8011
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -57,7 +57,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;4810;0;212;352;0;0;1
+801;0;8011;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -69,7 +69,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
16765728
// aLegendEntryPosition.X
-6420
+9621
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -77,7 +77,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;6420;0;212;352;0;0;1
+801;0;9621;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -89,7 +89,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
16711807
// aLegendEntryPosition.X
-8030
+11231
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -97,7 +97,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;8030;0;212;352;0;0;1
+801;0;11231;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -109,7 +109,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
8257569
// aLegendEntryPosition.X
-9746
+12947
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -117,7 +117,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;9746;0;212;352;0;0;1
+801;0;12947;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -129,7 +129,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
8637183
// aLegendEntryPosition.X
-11356
+14557
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -137,7 +137,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;11356;0;212;352;0;0;1
+801;0;14557;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -149,7 +149,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
3227652
// aLegendEntryPosition.X
-13019
+16220
// aLegendEntryPosition.Y
352
// aLegendEntrySize.Height
@@ -157,7 +157,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;13019;0;212;352;0;0;1
+801;0;16220;0;212;352;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -169,7 +169,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
11456256
// aLegendEntryPosition.X
-1590
+4791
// aLegendEntryPosition.Y
797
// aLegendEntrySize.Height
@@ -177,7 +177,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;1590;0;212;797;0;0;1
+801;0;4791;0;212;797;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -189,7 +189,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
4923247
// aLegendEntryPosition.X
-3200
+6401
// aLegendEntryPosition.Y
797
// aLegendEntrySize.Height
@@ -197,7 +197,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;3200;0;212;797;0;0;1
+801;0;6401;0;212;797;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -209,7 +209,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
16749838
// aLegendEntryPosition.X
-4810
+8011
// aLegendEntryPosition.Y
797
// aLegendEntrySize.Height
@@ -217,7 +217,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;4810;0;212;797;0;0;1
+801;0;8011;0;212;797;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -229,7 +229,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
12910603
// aLegendEntryPosition.X
-6420
+9621
// aLegendEntryPosition.Y
797
// aLegendEntrySize.Height
@@ -237,7 +237,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;6420;0;212;797;0;0;1
+801;0;9621;0;212;797;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -249,7 +249,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
34001
// aLegendEntryPosition.X
-8030
+11231
// aLegendEntryPosition.Y
797
// aLegendEntrySize.Height
@@ -257,7 +257,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;8030;0;212;797;0;0;1
+801;0;11231;0;212;797;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -269,7 +269,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
17798
// aLegendEntryPosition.X
-9746
+12947
// aLegendEntryPosition.Y
797
// aLegendEntrySize.Height
@@ -277,7 +277,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;9746;0;212;797;0;0;1
+801;0;12947;0;212;797;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
@@ -289,7 +289,7 @@ com.sun.star.drawing.PolyPolygonShape
// static_cast<sal_Int32>(aEntryGeomColor)
16728590
// aLegendEntryPosition.X
-11356
+14557
// aLegendEntryPosition.Y
797
// aLegendEntrySize.Height
@@ -297,7 +297,7 @@ com.sun.star.drawing.PolyPolygonShape
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;11356;0;212;797;0;0;1
+801;0;14557;0;212;797;0;0;1
// xLegendEntryContainer->getCount()
3
// sEntryGeomShapeType
diff --git a/chart2/qa/extras/chart2dump/reference/legendtest/multiple_categories.txt b/chart2/qa/extras/chart2dump/reference/legendtest/multiple_categories.txt
index 0e0336ffed1d..2c1295a729a9 100755
--- a/chart2/qa/extras/chart2dump/reference/legendtest/multiple_categories.txt
+++ b/chart2/qa/extras/chart2dump/reference/legendtest/multiple_categories.txt
@@ -1,23 +1,23 @@
// aLegendPosition.X
-2397
+3005
// aLegendPosition.Y
-6498
+12414
// aLegendSize.Width
-8041
+16083
// aLegendSize.Height
-938
+519
// nLegendEntryCount
8
// aLegendEntryPosition.X
-2501
+3109
// aLegendEntryPosition.Y
-6662
+12578
// aLegendEntrySize.Height
190
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;2501;0;191;6662;0;0;1
+801;0;3109;0;191;12578;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
@@ -25,15 +25,15 @@ com.sun.star.drawing.LineShape
// static_cast<sal_Int32>(aEntryGeomColor)
7512015
// aLegendEntryPosition.X
-4273
+4881
// aLegendEntryPosition.Y
-6662
+12578
// aLegendEntrySize.Height
190
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;4273;0;191;6662;0;0;1
+801;0;4881;0;191;12578;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
@@ -41,15 +41,15 @@ com.sun.star.drawing.LineShape
// static_cast<sal_Int32>(aEntryGeomColor)
7512015
// aLegendEntryPosition.X
-6363
+6971
// aLegendEntryPosition.Y
-6662
+12578
// aLegendEntrySize.Height
190
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;6363;0;191;6662;0;0;1
+801;0;6971;0;191;12578;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
@@ -57,15 +57,15 @@ com.sun.star.drawing.LineShape
// static_cast<sal_Int32>(aEntryGeomColor)
7512015
// aLegendEntryPosition.X
-8453
+9061
// aLegendEntryPosition.Y
-6662
+12578
// aLegendEntrySize.Height
190
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;8453;0;191;6662;0;0;1
+801;0;9061;0;191;12578;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
@@ -73,15 +73,15 @@ com.sun.star.drawing.LineShape
// static_cast<sal_Int32>(aEntryGeomColor)
7512015
// aLegendEntryPosition.X
-2501
+11151
// aLegendEntryPosition.Y
-7081
+12578
// aLegendEntrySize.Height
190
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;2501;0;191;7081;0;0;1
+801;0;11151;0;191;12578;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
@@ -89,15 +89,15 @@ com.sun.star.drawing.LineShape
// static_cast<sal_Int32>(aEntryGeomColor)
7512015
// aLegendEntryPosition.X
-4273
+12923
// aLegendEntryPosition.Y
-7081
+12578
// aLegendEntrySize.Height
190
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;4273;0;191;7081;0;0;1
+801;0;12923;0;191;12578;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
@@ -105,15 +105,15 @@ com.sun.star.drawing.LineShape
// static_cast<sal_Int32>(aEntryGeomColor)
7512015
// aLegendEntryPosition.X
-6363
+15013
// aLegendEntryPosition.Y
-7081
+12578
// aLegendEntrySize.Height
190
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;6363;0;191;7081;0;0;1
+801;0;15013;0;191;12578;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType
@@ -121,15 +121,15 @@ com.sun.star.drawing.LineShape
// static_cast<sal_Int32>(aEntryGeomColor)
7512015
// aLegendEntryPosition.X
-8453
+17103
// aLegendEntryPosition.Y
-7081
+12578
// aLegendEntrySize.Height
190
// aLegendEntrySize.Width
800
// aLegendEntryTransformation
-801;0;8453;0;191;7081;0;0;1
+801;0;17103;0;191;12578;0;0;1
// xLegendEntryContainer->getCount()
2
// sEntryGeomShapeType