diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-02-17 20:14:21 +0100 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-02-17 19:49:12 +0000 |
commit | bc9a9bf27bca81548710adf563523b5c80c84bd3 (patch) | |
tree | 74fe425ae63c52c7a3a7d1f5e65c016b066fddb0 /chart2 | |
parent | 42c0dfbd6b08ecbc5893595a4100d572a3082d8a (diff) |
ChartDumpTest: Avoid using thousand separator in axis labels
On different systems different separator is used
(e.g. coma, space).
Plus tdf#106068 can explain why some of the tests failes
on mac, so disable only these tests.
Change-Id: Id0fa8938d93dd9d4843d42426d369dcdfa1daef1
Reviewed-on: https://gerrit.libreoffice.org/34378
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'chart2')
16 files changed, 195 insertions, 116 deletions
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index a11c4838e13f..1cffe8166cd1 100755 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -25,15 +25,7 @@ #include <fstream> -#define EPS 1E-12 - -#if defined(MACOSX) // On mac we don't check geometry -#define INT_EPS 1000.1 -#elif defined(X86) -#define INT_EPS 2.1 -#else #define INT_EPS 0.1 -#endif #define DECLARE_DUMP_TEST(TestName, BaseClass, DumpMode) \ class TestName : public BaseClass { \ @@ -395,6 +387,8 @@ DECLARE_DUMP_TEST(ChartDataTest, Chart2DumpTest, false) } } +#if !defined(MACOSX) + DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = @@ -495,6 +489,8 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false) } } +#endif + DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = @@ -643,9 +639,10 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) } } +#if !defined(MACOSX) + DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false) { - const double fLocalEPS = 150.1; const std::vector<OUString> aTestFiles = { "default_formated_axis.odp", @@ -701,18 +698,18 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false) // Check size and position uno::Reference<drawing::XShape> xLabelShape(xLabel, uno::UNO_QUERY); awt::Point aLabelPosition = xLabelShape->getPosition(); - CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelPosition.X, std::max(fLocalEPS,INT_EPS)); - CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelPosition.Y, std::max(fLocalEPS, INT_EPS)); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelPosition.X, INT_EPS); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelPosition.Y, INT_EPS); awt::Size aLabelSize = xLabelShape->getSize(); - CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelSize.Height, std::max(fLocalEPS, INT_EPS)); - CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelSize.Width, std::max(fLocalEPS, INT_EPS)); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelSize.Height, INT_EPS); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelSize.Width, INT_EPS); // Check transformation Reference< beans::XPropertySet > xPropSet(xLabelShape, UNO_QUERY_THROW); CPPUNIT_ASSERT(xPropSet.is()); drawing::HomogenMatrix3 aLabelTransformation; xPropSet->getPropertyValue("Transformation") >>= aLabelTransformation; - CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aLabelTransformation, std::max(fLocalEPS, INT_EPS)); + CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aLabelTransformation, INT_EPS); // Check font color and height util::Color aLabelFontColor = 0; @@ -720,12 +717,14 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false) CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aLabelFontColor)); float fLabelFontHeight = 0.0f; xPropSet->getPropertyValue("CharHeight") >>= fLabelFontHeight; - CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(fLabelFontHeight, EPS); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(fLabelFontHeight, 1E-12); } } } } +#endif + DECLARE_DUMP_TEST(ColumnBarChartTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = @@ -801,11 +800,15 @@ DECLARE_DUMP_TEST(ColumnBarChartTest, Chart2DumpTest, false) } } +#if !defined(MACOSX) + DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "formated_chartwall.odp" + "chartwall_auto_adjust_with_titles.ods", + "chartwall_auto_adjust_without_titles.ods", + "chartwall_custom_positioning.ods" }; for (const OUString& sTestFile : aTestFiles) @@ -821,7 +824,21 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false) uno::Reference<drawing::XShape> xChartWall = getShapeByName(xShapes, "CID/DiagramWall="); CPPUNIT_ASSERT(xChartWall.is()); + + // Check position and size + awt::Point aChartWallPosition = xChartWall->getPosition(); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallPosition.X, INT_EPS); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallPosition.Y, INT_EPS); + awt::Size aChartWallSize = xChartWall->getSize(); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallSize.Height, INT_EPS); + CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallSize.Width, INT_EPS); + + // Check transformation Reference< beans::XPropertySet > xPropSet(xChartWall, UNO_QUERY_THROW); + CPPUNIT_ASSERT(xPropSet.is()); + drawing::HomogenMatrix3 aChartWallTransformation; + xPropSet->getPropertyValue("Transformation") >>= aChartWallTransformation; + CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aChartWallTransformation, INT_EPS); // Check fill properties drawing::FillStyle aChartWallFillStyle; @@ -851,6 +868,8 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false) } } +#endif + DECLARE_DUMP_TEST(PieChartTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = diff --git a/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp b/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp Binary files differindex 5ffd093e9eb5..a09ddb893daa 100755 --- a/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp +++ b/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp 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 Binary files differnew file mode 100755 index 000000000000..0ccbfd69ee4c --- /dev/null +++ b/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_with_titles.ods 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 Binary files differnew file mode 100755 index 000000000000..941ea62011a0 --- /dev/null +++ b/chart2/qa/extras/chart2dump/data/chartwall_auto_adjust_without_titles.ods diff --git a/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.ods b/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.ods Binary files differnew file mode 100755 index 000000000000..14767ed9f9a3 --- /dev/null +++ b/chart2/qa/extras/chart2dump/data/chartwall_custom_positioning.ods diff --git a/chart2/qa/extras/chart2dump/data/default_formated_axis.odp b/chart2/qa/extras/chart2dump/data/default_formated_axis.odp Binary files differindex 04e1d671cf22..d8409f2b4f62 100755 --- a/chart2/qa/extras/chart2dump/data/default_formated_axis.odp +++ b/chart2/qa/extras/chart2dump/data/default_formated_axis.odp diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_labels.odp b/chart2/qa/extras/chart2dump/data/formated_axis_labels.odp Binary files differindex 8657b18d3658..18496456e024 100755 --- a/chart2/qa/extras/chart2dump/data/formated_axis_labels.odp +++ b/chart2/qa/extras/chart2dump/data/formated_axis_labels.odp diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp b/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp Binary files differindex f612160b6b1a..7a421497b442 100755 --- a/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp +++ b/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp diff --git a/chart2/qa/extras/chart2dump/data/formated_chartwall.odp b/chart2/qa/extras/chart2dump/data/formated_chartwall.odp Binary files differdeleted file mode 100755 index 697b209bd070..000000000000 --- a/chart2/qa/extras/chart2dump/data/formated_chartwall.odp +++ /dev/null diff --git a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp Binary files differindex cb3ae37e92a4..ec315c491067 100755 --- a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp +++ b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp 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 e8ec2153f415..ff858b644f6a 100755 --- a/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt +++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt @@ -85,161 +85,161 @@ // fLabelFontHeight 10 // xLabel->getString() -2,000,000 Ft +2000000 Ft // aLabelPosition.X -2999 +3210 // aLabelPosition.Y 10773 // aLabelSize.Height 345 // aLabelSize.Width -2145 +1934 // aLabelTransformation -2146;0;2999;0;346;10773;0;0;1 +1935;0;3210;0;346;10773;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -4,000,000 Ft +4000000 Ft // aLabelPosition.X -2999 +3210 // aLabelPosition.Y 9835 // aLabelSize.Height 345 // aLabelSize.Width -2145 +1934 // aLabelTransformation -2146;0;2999;0;346;9835;0;0;1 +1935;0;3210;0;346;9835;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -6,000,000 Ft +6000000 Ft // aLabelPosition.X -2999 +3210 // aLabelPosition.Y 8898 // aLabelSize.Height 345 // aLabelSize.Width -2145 +1934 // aLabelTransformation -2146;0;2999;0;346;8898;0;0;1 +1935;0;3210;0;346;8898;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -8,000,000 Ft +8000000 Ft // aLabelPosition.X -2999 +3210 // aLabelPosition.Y 7960 // aLabelSize.Height 345 // aLabelSize.Width -2145 +1934 // aLabelTransformation -2146;0;2999;0;346;7960;0;0;1 +1935;0;3210;0;346;7960;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -10,000,000 Ft +10000000 Ft // aLabelPosition.X -2813 +3025 // aLabelPosition.Y 7023 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2332;0;2813;0;346;7023;0;0;1 +2120;0;3025;0;346;7023;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -12,000,000 Ft +12000000 Ft // aLabelPosition.X -2813 +3025 // aLabelPosition.Y 6085 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2332;0;2813;0;346;6085;0;0;1 +2120;0;3025;0;346;6085;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -14,000,000 Ft +14000000 Ft // aLabelPosition.X -2813 +3025 // aLabelPosition.Y 5147 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2332;0;2813;0;346;5147;0;0;1 +2120;0;3025;0;346;5147;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -16,000,000 Ft +16000000 Ft // aLabelPosition.X -2813 +3025 // aLabelPosition.Y 4210 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2332;0;2813;0;346;4210;0;0;1 +2120;0;3025;0;346;4210;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -18,000,000 Ft +18000000 Ft // aLabelPosition.X -2813 +3025 // aLabelPosition.Y 3272 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2332;0;2813;0;346;3272;0;0;1 +2120;0;3025;0;346;3272;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -20,000,000 Ft +20000000 Ft // aLabelPosition.X -2813 +3025 // aLabelPosition.Y 2335 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2332;0;2813;0;346;2335;0;0;1 +2120;0;3025;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 072725946f0d..df58b0de5918 100755 --- a/chart2/qa/extras/chart2dump/reference/axislabeltest/formated_axis_labels.txt +++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/formated_axis_labels.txt @@ -4,7 +4,7 @@ // xLabel->getString() 1. quarter // aLabelPosition.X -5781 +5550 // aLabelPosition.Y 13076 // aLabelSize.Height @@ -12,7 +12,7 @@ // aLabelSize.Width 1775 // aLabelTransformation -1776;0;5781;0;452;13076;0;0;1 +1776;0;5550;0;452;13076;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 8388352 // fLabelFontHeight @@ -20,7 +20,7 @@ // xLabel->getString() 2. quarter // aLabelPosition.X -10756 +10591 // aLabelPosition.Y 13076 // aLabelSize.Height @@ -28,7 +28,7 @@ // aLabelSize.Width 1775 // aLabelTransformation -1776;0;10756;0;452;13076;0;0;1 +1776;0;10591;0;452;13076;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 8388352 // fLabelFontHeight @@ -36,7 +36,7 @@ // xLabel->getString() 2. quarter // aLabelPosition.X -15731 +15632 // aLabelPosition.Y 13076 // aLabelSize.Height @@ -44,7 +44,7 @@ // aLabelSize.Width 1775 // aLabelTransformation -1776;0;15731;0;452;13076;0;0;1 +1776;0;15632;0;452;13076;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 8388352 // fLabelFontHeight @@ -52,7 +52,7 @@ // xLabel->getString() 2. quarter // aLabelPosition.X -20706 +20673 // aLabelPosition.Y 13076 // aLabelSize.Height @@ -60,7 +60,7 @@ // aLabelSize.Width 1775 // aLabelTransformation -1776;0;20706;0;452;13076;0;0;1 +1776;0;20673;0;452;13076;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 8388352 // fLabelFontHeight @@ -71,7 +71,7 @@ // xLabel->getString() - Ft // aLabelPosition.X -2925 +2661 // aLabelPosition.Y 12548 // aLabelSize.Height @@ -79,13 +79,13 @@ // aLabelSize.Width 1007 // aLabelTransformation -1008;0;2925;0;558;12548;0;0;1 +1008;0;2661;0;558;12548;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -2,000,000 Ft +2000000 Ft // aLabelPosition.X 782 // aLabelPosition.Y @@ -93,15 +93,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3150 +2886 // aLabelTransformation -3151;0;782;0;558;11320;0;0;1 +2887;0;782;0;558;11320;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -4,000,000 Ft +4000000 Ft // aLabelPosition.X 782 // aLabelPosition.Y @@ -109,15 +109,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3150 +2886 // aLabelTransformation -3151;0;782;0;558;10093;0;0;1 +2887;0;782;0;558;10093;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -6,000,000 Ft +6000000 Ft // aLabelPosition.X 782 // aLabelPosition.Y @@ -125,15 +125,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3150 +2886 // aLabelTransformation -3151;0;782;0;558;8866;0;0;1 +2887;0;782;0;558;8866;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -8,000,000 Ft +8000000 Ft // aLabelPosition.X 782 // aLabelPosition.Y @@ -141,15 +141,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3150 +2886 // aLabelTransformation -3151;0;782;0;558;7639;0;0;1 +2887;0;782;0;558;7639;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -10,000,000 Ft +10000000 Ft // aLabelPosition.X 491 // aLabelPosition.Y @@ -157,15 +157,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3441 +3177 // aLabelTransformation -3442;0;491;0;558;6411;0;0;1 +3178;0;491;0;558;6411;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -12,000,000 Ft +12000000 Ft // aLabelPosition.X 491 // aLabelPosition.Y @@ -173,15 +173,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3441 +3177 // aLabelTransformation -3442;0;491;0;558;5184;0;0;1 +3178;0;491;0;558;5184;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -14,000,000 Ft +14000000 Ft // aLabelPosition.X 491 // aLabelPosition.Y @@ -189,15 +189,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3441 +3177 // aLabelTransformation -3442;0;491;0;558;3957;0;0;1 +3178;0;491;0;558;3957;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -16,000,000 Ft +16000000 Ft // aLabelPosition.X 491 // aLabelPosition.Y @@ -205,15 +205,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3441 +3177 // aLabelTransformation -3442;0;491;0;558;2730;0;0;1 +3178;0;491;0;558;2730;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -18,000,000 Ft +18000000 Ft // aLabelPosition.X 491 // aLabelPosition.Y @@ -221,15 +221,15 @@ // aLabelSize.Height 557 // aLabelSize.Width -3441 +3177 // aLabelTransformation -3442;0;491;0;558;1503;0;0;1 +3178;0;491;0;558;1503;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // fLabelFontHeight 14 // xLabel->getString() -20,000,000 Ft +20000000 Ft // aLabelPosition.X 491 // aLabelPosition.Y @@ -237,9 +237,9 @@ // aLabelSize.Height 557 // aLabelSize.Width -3441 +3177 // aLabelTransformation -3442;0;491;0;558;275;0;0;1 +3178;0;491;0;558;275;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 16711935 // 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 ece4ffad861d..e4ff85adab7f 100755 --- a/chart2/qa/extras/chart2dump/reference/axislabeltest/rotated_axis_labels.txt +++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/rotated_axis_labels.txt @@ -85,65 +85,65 @@ // fLabelFontHeight 10 // xLabel->getString() -5,000,000 Ft +5000000 Ft // aLabelPosition.X -1477 +1680 // aLabelPosition.Y -7194 +7249 // aLabelSize.Height 345 // aLabelSize.Width -2145 +1934 // aLabelTransformation -2072.87682321634;-89.5513896054722;1477;555.425670790009;334.210335896018;7194;0;0;1 +1869.06647386935;-89.5513896054722;1680;500.814852273378;334.210335896018;7249;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -10,000,000 Ft +10000000 Ft // aLabelPosition.X -1297 +1502 // aLabelPosition.Y -5202 +5257 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2252.53902690611;-89.5513896054722;1297;603.566013179078;334.210335896018;5202;0;0;1 +2047.76275173282;-89.5513896054722;1502;548.696375617344;334.210335896018;5257;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -15,000,000 Ft +15000000 Ft // aLabelPosition.X -1297 +1502 // aLabelPosition.Y -3257 +3312 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2252.53902690611;-89.5513896054722;1297;603.566013179078;334.210335896018;3257;0;0;1 +2047.76275173282;-89.5513896054722;1502;548.696375617344;334.210335896018;3312;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight 10 // xLabel->getString() -20,000,000 Ft +20000000 Ft // aLabelPosition.X -1297 +1502 // aLabelPosition.Y -1313 +1368 // aLabelSize.Height 345 // aLabelSize.Width -2331 +2119 // aLabelTransformation -2252.53902690611;-89.5513896054722;1297;603.566013179078;334.210335896018;1313;0;0;1 +2047.76275173282;-89.5513896054722;1502;548.696375617344;334.210335896018;1368;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 new file mode 100755 index 000000000000..a18b1625571e --- /dev/null +++ b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_with_titles.txt @@ -0,0 +1,20 @@ +// aChartWallPosition.X +3501 +// aChartWallPosition.Y +1421 +// aChartWallSize.Height +5892 +// aChartWallSize.Width +9920 +// aChartWallTransformation +9921;0;3501;0;5893;1421;0;0;1 +// static_cast<sal_Int32>(aChartWallFillStyle) +2 +// static_cast<sal_Int32>(aChartWallFillColor) +15132390 +// sChartWallLineDash +0;1;200710;0;152 +// static_cast<sal_Int32>(aChartWallLineColor) +11010131 +// nChartWallLineWidth +100 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 new file mode 100755 index 000000000000..8b8ee7f4ddd1 --- /dev/null +++ b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_auto_adjust_without_titles.txt @@ -0,0 +1,20 @@ +// aChartWallPosition.X +2503 +// aChartWallPosition.Y +354 +// aChartWallSize.Height +7888 +// aChartWallSize.Width +12277 +// aChartWallTransformation +12278;0;2503;0;7889;354;0;0;1 +// static_cast<sal_Int32>(aChartWallFillStyle) +2 +// static_cast<sal_Int32>(aChartWallFillColor) +15132390 +// sChartWallLineDash +0;1;200710;0;152 +// static_cast<sal_Int32>(aChartWallLineColor) +11010131 +// nChartWallLineWidth +100 diff --git a/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt new file mode 100755 index 000000000000..325d29379591 --- /dev/null +++ b/chart2/qa/extras/chart2dump/reference/chartwalltest/chartwall_custom_positioning.txt @@ -0,0 +1,20 @@ +// aChartWallPosition.X +6327 +// aChartWallPosition.Y +1415 +// aChartWallSize.Height +5949 +// aChartWallSize.Width +6611 +// aChartWallTransformation +6612;0;6327;0;5950;1415;0;0;1 +// static_cast<sal_Int32>(aChartWallFillStyle) +1 +// static_cast<sal_Int32>(aChartWallFillColor) +13773611 +// sChartWallLineDash +0;2;01;203;203 +// static_cast<sal_Int32>(aChartWallLineColor) +8388352 +// nChartWallLineWidth +110 |