diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-02-16 14:56:19 +0100 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-02-16 14:24:04 +0000 |
commit | 7bb3643c6da11c580f4db64e3f052e97e59cdbe1 (patch) | |
tree | 672196aff64664f63dbb5d8b8698fc62b169404d /chart2 | |
parent | external/firebird: Work around operator new alignment violations (diff) | |
download | core-7bb3643c6da11c580f4db64e3f052e97e59cdbe1.tar.gz core-7bb3643c6da11c580f4db64e3f052e97e59cdbe1.zip |
ChartDumpTest: Convert some of the test documents from ods to odp
Let's see random test failures are related to calc.
Change-Id: I9164a900b8a7d631df75ba4064d8423400cf34bc
Reviewed-on: https://gerrit.libreoffice.org/34337
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 | 11 | ||||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/axis_special_positioning.odp | bin | 0 -> 27406 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/axis_special_positioning.ods | bin | 29570 -> 0 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/default_formated_axis.odp | bin | 0 -> 27484 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/formated_axis_lines.odp | bin | 0 -> 21425 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/formated_axis_lines.ods | bin | 29745 -> 0 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp | bin | 0 -> 20942 bytes | |||
-rwxr-xr-x | chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt | 20 | ||||
-rwxr-xr-x | chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt | 20 | ||||
-rwxr-xr-x | chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt | 22 | ||||
-rwxr-xr-x | chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt | 20 |
11 files changed, 47 insertions, 46 deletions
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index ba1d83b391a5..db18512b5f58 100755 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -571,17 +571,18 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "default_formated_axis.ods", - "axis_special_positioning.ods", - "formated_axis_lines.ods", - "rotated_axis_labels.ods" + "default_formated_axis.odp", + "axis_special_positioning.odp", + "formated_axis_lines.odp", + "rotated_axis_labels.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 Binary files differnew file mode 100755 index 000000000000..568dd5ce569a --- /dev/null +++ b/chart2/qa/extras/chart2dump/data/axis_special_positioning.odp diff --git a/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods b/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods Binary files differdeleted file mode 100755 index 0dfa9f2c39b6..000000000000 --- a/chart2/qa/extras/chart2dump/data/axis_special_positioning.ods +++ /dev/null diff --git a/chart2/qa/extras/chart2dump/data/default_formated_axis.odp b/chart2/qa/extras/chart2dump/data/default_formated_axis.odp Binary files differnew file mode 100755 index 000000000000..869f7e3e89e9 --- /dev/null +++ b/chart2/qa/extras/chart2dump/data/default_formated_axis.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 differnew file mode 100755 index 000000000000..f6a1cc8a8fb0 --- /dev/null +++ b/chart2/qa/extras/chart2dump/data/formated_axis_lines.odp diff --git a/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods b/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods Binary files differdeleted file mode 100755 index 02c317ae01ae..000000000000 --- a/chart2/qa/extras/chart2dump/data/formated_axis_lines.ods +++ /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 differnew file mode 100755 index 000000000000..4314c455da45 --- /dev/null +++ b/chart2/qa/extras/chart2dump/data/rotated_axis_labels.odp 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 09eb0d7fc647..4c444c9346d0 100755 --- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt +++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/axis_special_positioning.txt @@ -1,16 +1,16 @@ /// CID/D=0:CS=0:Axis=0,0 // aAxisPosition.X -4438 +3469 // aAxisPosition.Y -1092 +1303 // aAxisSize.Height -645 +300 // aAxisSize.Width -14869 +11625 // aAxisTransformation -14870;0;4438;0;646;1092;0;0;1 +11626;0;3469;0;301;1303;0;0;1 // nAxisGeometriesCount -4 +2 // sAxisLineDash 0;1;201;20;20 // static_cast<sal_Int32>(aAxisLineColor) @@ -19,15 +19,15 @@ 0 /// CID/D=0:CS=0:Axis=1,0 // aAxisPosition.X -19307 +15094 // aAxisPosition.Y -1587 +1453 // aAxisSize.Height -5931 +5431 // aAxisSize.Width 150 // aAxisTransformation -151;0;19307;0;5932;1587;0;0;1 +151;0;15094;0;5432;1453;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 e977fa9485dc..59e382192ed8 100755 --- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt +++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/default_formated_axis.txt @@ -1,16 +1,16 @@ /// CID/D=0:CS=0:Axis=0,0 // aAxisPosition.X -3510 +3486 // aAxisPosition.Y -7520 +7398 // aAxisSize.Height -495 +150 // aAxisSize.Width -14439 +11283 // aAxisTransformation -14440;0;3510;0;496;7520;0;0;1 +11284;0;3486;0;151;7398;0;0;1 // nAxisGeometriesCount -4 +2 // sAxisLineDash 0;1;201;20;20 // static_cast<sal_Int32>(aAxisLineColor) @@ -19,15 +19,15 @@ 0 /// CID/D=0:CS=0:Axis=1,0 // aAxisPosition.X -3360 +3336 // aAxisPosition.Y -1588 +1561 // aAxisSize.Height -5932 +5837 // aAxisSize.Width 150 // aAxisTransformation -151;0;3360;0;5933;1588;0;0;1 +151;0;3336;0;5838;1561;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 e096b6eefeee..d7591c10a49e 100755 --- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt +++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/formated_axis_lines.txt @@ -1,33 +1,33 @@ /// CID/D=0:CS=0:Axis=0,0 // aAxisPosition.X -3601 +2864 // aAxisPosition.Y -7520 +7221 // aAxisSize.Height -495 +150 // aAxisSize.Width -14815 +11786 // aAxisTransformation -14816;0;3601;0;496;7520;0;0;1 +11787;0;2864;0;151;7221;0;0;1 // nAxisGeometriesCount -4 +2 // sAxisLineDash 0;1;00;0;457 // static_cast<sal_Int32>(aAxisLineColor) -0 +16711680 // nAxisLineWidth 100 /// CID/D=0:CS=0:Axis=1,0 // aAxisPosition.X -3451 +2714 // aAxisPosition.Y -1588 +1525 // aAxisSize.Height -5932 +5696 // aAxisSize.Width 150 // aAxisTransformation -151;0;3451;0;5933;1588;0;0;1 +151;0;2714;0;5697;1525;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 88988604272d..dffbfa06f19d 100755 --- a/chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt +++ b/chart2/qa/extras/chart2dump/reference/axisgeometrytest/rotated_axis_labels.txt @@ -1,16 +1,16 @@ /// CID/D=0:CS=0:Axis=0,0 // aAxisPosition.X -3510 +2854 // aAxisPosition.Y -7520 +7408 // aAxisSize.Height -1424 +150 // aAxisSize.Width -14439 +12330 // aAxisTransformation -14440;0;3510;0;1425;7520;0;0;1 +12331;0;2854;0;151;7408;0;0;1 // nAxisGeometriesCount -4 +2 // sAxisLineDash 0;1;201;20;20 // static_cast<sal_Int32>(aAxisLineColor) @@ -19,15 +19,15 @@ 0 /// CID/D=0:CS=0:Axis=1,0 // aAxisPosition.X -3360 +2704 // aAxisPosition.Y -1588 +1564 // aAxisSize.Height -5932 +5844 // aAxisSize.Width 150 // aAxisTransformation -151;0;3360;0;5933;1588;0;0;1 +151;0;2704;0;5845;1564;0;0;1 // nAxisGeometriesCount 2 // sAxisLineDash |