diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-02-13 23:12:01 +0100 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-02-14 10:42:58 +0000 |
commit | 5815ca4ef1126140e08f3a1d106bcadc41044505 (patch) | |
tree | 95408df2e20850a60b444ad8fe6580f0049dc8f0 /chart2 | |
parent | aea7594bf1905c8a883b19f3191adb2488e05dd3 (diff) |
ChartDumpTest: Avoid using Arial font in test documents
Let's see whether this caused the position and size
differences between different machines.
Change-Id: I6cf0a2fff86d7ce8613d4ca4bbcfe6e001bd9f49
Reviewed-on: https://gerrit.libreoffice.org/34226
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'chart2')
-rwxr-xr-x | chart2/qa/extras/chart2dump/chart2dump.cxx | 6 | ||||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/axis_special_positioning.ods | bin | 29428 -> 29449 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/default_formated_axis.ods | bin | 29985 -> 29861 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/formated_axis_lines.ods | bin | 30220 -> 30146 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods | bin | 30370 -> 30613 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt | 4 | ||||
-rwxr-xr-x | chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt | 8 |
7 files changed, 12 insertions, 6 deletions
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index 20e3cd75d02b..3ebea8029607 100755 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -560,6 +560,9 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false) } } +#undef INT_EPS +#define INT_EPS 0.1 + DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = @@ -633,6 +636,9 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) } } +#undef INT_EPS +#define INT_EPS 2.1 + DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = diff --git a/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods b/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods Binary files differindex f60197a0d2c3..0ca86c65a37c 100755 --- a/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods +++ b/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods diff --git a/chart2/qa/extras/chart2dump/data/default_formated_axis.ods b/chart2/qa/extras/chart2dump/data/default_formated_axis.ods Binary files differindex 96f846219077..e40155fd5a1a 100755 --- a/chart2/qa/extras/chart2dump/data/default_formated_axis.ods +++ b/chart2/qa/extras/chart2dump/data/default_formated_axis.ods diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods b/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods Binary files differindex 1e51ef1522fa..c44fd8fff8f0 100755 --- a/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods +++ b/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods diff --git a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods Binary files differindex c5a7cd65784c..451547868584 100755 --- a/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods +++ b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.ods 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 5fc5c6c34359..e977fa9485dc 100755 --- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt +++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt @@ -6,9 +6,9 @@ // aAxisSize.Height 495 // aAxisSize.Width -14438 +14439 // aAxisTransformation -14439;0;3510;0;496;7520;0;0;1 +14440;0;3510;0;496;7520;0;0;1 // nAxisGeometriesCount 4 // 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 aa01dfcaf200..34cfc5b52b61 100755 --- a/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt +++ b/chart2/qa/extras/chart2dump/reference/axislabeltest/default_formated_axis.txt @@ -36,7 +36,7 @@ // xLabel->getString() 3. negyedév // aLabelPosition.X -11593 +11594 // aLabelPosition.Y 7770 // aLabelSize.Height @@ -44,7 +44,7 @@ // aLabelSize.Width 1881 // aLabelTransformation -1882;0;11593;0;346;7770;0;0;1 +1882;0;11594;0;346;7770;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight @@ -52,7 +52,7 @@ // xLabel->getString() 4. negyedév // aLabelPosition.X -15203 +15204 // aLabelPosition.Y 7770 // aLabelSize.Height @@ -60,7 +60,7 @@ // aLabelSize.Width 1881 // aLabelTransformation -1882;0;15203;0;346;7770;0;0;1 +1882;0;15204;0;346;7770;0;0;1 // static_cast<sal_Int32>(aLabelFontColor) 0 // fLabelFontHeight |