chart2/qa/extras/chart2dump/chart2dump.cxx | 3 chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt | 24 +++--- chart2/qa/extras/chart2dump/reference/piecharttest/exploded_pie_chart.txt | 6 - chart2/qa/extras/chart2dump/reference/piecharttest/normal_pie_chart.txt | 6 - chart2/qa/extras/chart2dump/reference/piecharttest/pie_chart_many_slices.txt | 36 +++++----- chart2/qa/extras/chart2dump/reference/piecharttest/rotated_pie_chart.txt | 6 - 6 files changed, 41 insertions(+), 40 deletions(-)
New commits: commit 3fac6aa16eb4b3e19100725f9fc2350cfe9ecee8 Author: Tamás Zolnai <tamas.zol...@collabora.com> Date: Tue Feb 14 22:43:27 2017 +0100 ChartDumpTest: Don't use variable value in a note Change-Id: I06445065d138788652759b172436a7deb5f6c5c7 diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index 316445a..db82546 100755 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -900,7 +900,8 @@ DECLARE_DUMP_TEST(PieChartTest, Chart2DumpTest, false) { uno::Reference<drawing::XShape> xSlice(xIndexAccess->getByIndex(nSlice), UNO_QUERY_THROW); uno::Reference<container::XNamed> xNamedShape(xIndexAccess->getByIndex(nSlice), uno::UNO_QUERY); - CPPUNIT_DUMP_ASSERT_NOTE(xNamedShape->getName()); + OUString sName = xNamedShape->getName(); + CPPUNIT_DUMP_ASSERT_NOTE(sName.copy(sName.lastIndexOf("/D=0"))); // Check size and position awt::Point aSlicePosition = xSlice->getPosition(); diff --git a/chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt b/chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt index 2900dbc..b2dfd33 100755 --- a/chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt +++ b/chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt @@ -3,7 +3,7 @@ /// Series 0 slices // nSlicesCountInSeries 3 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,8664,2676,8861,2040/D=0:CS=0:CT=0:Series=0:Point=0 +/// /D=0:CS=0:CT=0:Series=0:Point=0 // aSlicePosition.X 6089 // aSlicePosition.Y @@ -18,7 +18,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,4613,7144,4000,7402/D=0:CS=0:CT=0:Series=0:Point=1 +/// /D=0:CS=0:CT=0:Series=0:Point=1 // aSlicePosition.X 4353 // aSlicePosition.Y @@ -33,7 +33,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=73,10742,7150,11355,7409/D=0:CS=0:CT=0:Series=0:Point=2 +/// /D=0:CS=0:CT=0:Series=0:Point=2 // aSlicePosition.X 8909 // aSlicePosition.Y @@ -51,7 +51,7 @@ /// Series 1 slices // nSlicesCountInSeries 3 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0 +/// /D=0:CS=0:CT=0:Series=1:Point=0 // aSlicePosition.X 6601 // aSlicePosition.Y @@ -66,7 +66,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1 +/// /D=0:CS=0:CT=0:Series=1:Point=1 // aSlicePosition.X 5018 // aSlicePosition.Y @@ -81,7 +81,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2 +/// /D=0:CS=0:CT=0:Series=1:Point=2 // aSlicePosition.X 6270 // aSlicePosition.Y @@ -99,7 +99,7 @@ /// Series 2 slices // nSlicesCountInSeries 3 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=0 +/// /D=0:CS=0:CT=0:Series=2:Point=0 // aSlicePosition.X 7688 // aSlicePosition.Y @@ -114,7 +114,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=1 +/// /D=0:CS=0:CT=0:Series=2:Point=1 // aSlicePosition.X 5683 // aSlicePosition.Y @@ -129,7 +129,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=2:Point=2 +/// /D=0:CS=0:CT=0:Series=2:Point=2 // aSlicePosition.X 7394 // aSlicePosition.Y @@ -147,7 +147,7 @@ /// Series 3 slices // nSlicesCountInSeries 3 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=0 +/// /D=0:CS=0:CT=0:Series=3:Point=0 // aSlicePosition.X 7714 // aSlicePosition.Y @@ -162,7 +162,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=1 +/// /D=0:CS=0:CT=0:Series=3:Point=1 // aSlicePosition.X 6348 // aSlicePosition.Y @@ -177,7 +177,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick/D=0:CS=0:CT=0:Series=3:Point=2 +/// /D=0:CS=0:CT=0:Series=3:Point=2 // aSlicePosition.X 6493 // aSlicePosition.Y diff --git a/chart2/qa/extras/chart2dump/reference/piecharttest/exploded_pie_chart.txt b/chart2/qa/extras/chart2dump/reference/piecharttest/exploded_pie_chart.txt index ab9309f..9cbc93d 100755 --- a/chart2/qa/extras/chart2dump/reference/piecharttest/exploded_pie_chart.txt +++ b/chart2/qa/extras/chart2dump/reference/piecharttest/exploded_pie_chart.txt @@ -3,7 +3,7 @@ /// Series 0 slices // nSlicesCountInSeries 3 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=35,7610,2955,7541,739/D=0:CS=0:CT=0:Series=0:Point=0 +/// /D=0:CS=0:CT=0:Series=0:Point=0 // aSlicePosition.X 6018 // aSlicePosition.Y @@ -18,7 +18,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=13,6027,6651,4375,8130/D=0:CS=0:CT=0:Series=0:Point=1 +/// /D=0:CS=0:CT=0:Series=0:Point=1 // aSlicePosition.X 5246 // aSlicePosition.Y @@ -33,7 +33,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,9891,5324,12103,5476/D=0:CS=0:CT=0:Series=0:Point=2 +/// /D=0:CS=0:CT=0:Series=0:Point=2 // aSlicePosition.X 7679 // aSlicePosition.Y diff --git a/chart2/qa/extras/chart2dump/reference/piecharttest/normal_pie_chart.txt b/chart2/qa/extras/chart2dump/reference/piecharttest/normal_pie_chart.txt index ba7f688..c009c97 100755 --- a/chart2/qa/extras/chart2dump/reference/piecharttest/normal_pie_chart.txt +++ b/chart2/qa/extras/chart2dump/reference/piecharttest/normal_pie_chart.txt @@ -3,7 +3,7 @@ /// Series 0 slices // nSlicesCountInSeries 3 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,5295,2852,2911,532/D=0:CS=0:CT=0:Series=0:Point=0 +/// /D=0:CS=0:CT=0:Series=0:Point=0 // aSlicePosition.X 4353 // aSlicePosition.Y @@ -18,7 +18,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,7437,8489,7196,11806/D=0:CS=0:CT=0:Series=0:Point=1 +/// /D=0:CS=0:CT=0:Series=0:Point=1 // aSlicePosition.X 4354 // aSlicePosition.Y @@ -33,7 +33,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,10224,3031,12770,891/D=0:CS=0:CT=0:Series=0:Point=2 +/// /D=0:CS=0:CT=0:Series=0:Point=2 // aSlicePosition.X 7678 // aSlicePosition.Y diff --git a/chart2/qa/extras/chart2dump/reference/piecharttest/pie_chart_many_slices.txt b/chart2/qa/extras/chart2dump/reference/piecharttest/pie_chart_many_slices.txt index dab8f12..820a344 100755 --- a/chart2/qa/extras/chart2dump/reference/piecharttest/pie_chart_many_slices.txt +++ b/chart2/qa/extras/chart2dump/reference/piecharttest/pie_chart_many_slices.txt @@ -3,7 +3,7 @@ /// Series 0 slices // nSlicesCountInSeries 18 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,10493,3869,10469,-234/D=0:CS=0:CT=0:Series=0:Point=0 +/// /D=0:CS=0:CT=0:Series=0:Point=0 // aSlicePosition.X 10469 // aSlicePosition.Y @@ -18,7 +18,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=82,10415,3870,10312,-232/D=0:CS=0:CT=0:Series=0:Point=1 +/// /D=0:CS=0:CT=0:Series=0:Point=1 // aSlicePosition.X 10275 // aSlicePosition.Y @@ -33,7 +33,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,10292,3875,10067,-222/D=0:CS=0:CT=0:Series=0:Point=2 +/// /D=0:CS=0:CT=0:Series=0:Point=2 // aSlicePosition.X 10224 // aSlicePosition.Y @@ -48,7 +48,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16765728 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,10137,3886,9756,-199/D=0:CS=0:CT=0:Series=0:Point=3 +/// /D=0:CS=0:CT=0:Series=0:Point=3 // aSlicePosition.X 10050 // aSlicePosition.Y @@ -63,7 +63,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 5741852 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,9891,3917,9265,-138/D=0:CS=0:CT=0:Series=0:Point=4 +/// /D=0:CS=0:CT=0:Series=0:Point=4 // aSlicePosition.X 9734 // aSlicePosition.Y @@ -78,7 +78,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 8257569 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,9605,3971,8693,-29/D=0:CS=0:CT=0:Series=0:Point=5 +/// /D=0:CS=0:CT=0:Series=0:Point=5 // aSlicePosition.X 9478 // aSlicePosition.Y @@ -93,7 +93,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 8637183 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,9330,4044,8143,116/D=0:CS=0:CT=0:Series=0:Point=6 +/// /D=0:CS=0:CT=0:Series=0:Point=6 // aSlicePosition.X 9184 // aSlicePosition.Y @@ -108,7 +108,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 3227652 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,9020,4152,7522,331/D=0:CS=0:CT=0:Series=0:Point=7 +/// /D=0:CS=0:CT=0:Series=0:Point=7 // aSlicePosition.X 8858 // aSlicePosition.Y @@ -123,7 +123,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 11456256 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,8680,4303,6842,633/D=0:CS=0:CT=0:Series=0:Point=8 +/// /D=0:CS=0:CT=0:Series=0:Point=8 // aSlicePosition.X 8506 // aSlicePosition.Y @@ -138,7 +138,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 4923247 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,8262,4544,6007,1115/D=0:CS=0:CT=0:Series=0:Point=9 +/// /D=0:CS=0:CT=0:Series=0:Point=9 // aSlicePosition.X 8030 // aSlicePosition.Y @@ -153,7 +153,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16749838 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,7649,5037,4781,2102/D=0:CS=0:CT=0:Series=0:Point=10 +/// /D=0:CS=0:CT=0:Series=0:Point=10 // aSlicePosition.X 7311 // aSlicePosition.Y @@ -168,7 +168,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 12910603 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,6794,6247,3071,4521/D=0:CS=0:CT=0:Series=0:Point=11 +/// /D=0:CS=0:CT=0:Series=0:Point=11 // aSlicePosition.X 6490 // aSlicePosition.Y @@ -183,7 +183,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 34001 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,6468,8641,2419,9310/D=0:CS=0:CT=0:Series=0:Point=12 +/// /D=0:CS=0:CT=0:Series=0:Point=12 // aSlicePosition.X 6414 // aSlicePosition.Y @@ -198,7 +198,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,8059,11259,5601,14545/D=0:CS=0:CT=0:Series=0:Point=13 +/// /D=0:CS=0:CT=0:Series=0:Point=13 // aSlicePosition.X 6959 // aSlicePosition.Y @@ -213,7 +213,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,11725,11895,12932,15817/D=0:CS=0:CT=0:Series=0:Point=14 +/// /D=0:CS=0:CT=0:Series=0:Point=14 // aSlicePosition.X 9562 // aSlicePosition.Y @@ -228,7 +228,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16765728 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,14540,8786,18563,9599/D=0:CS=0:CT=0:Series=0:Point=15 +/// /D=0:CS=0:CT=0:Series=0:Point=15 // aSlicePosition.X 10518 // aSlicePosition.Y @@ -243,7 +243,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 5741852 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,13116,4796,15715,1619/D=0:CS=0:CT=0:Series=0:Point=16 +/// /D=0:CS=0:CT=0:Series=0:Point=16 // aSlicePosition.X 10518 // aSlicePosition.Y @@ -258,7 +258,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 8257569 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=49,10805,3879,11092,-214/D=0:CS=0:CT=0:Series=0:Point=17 +/// /D=0:CS=0:CT=0:Series=0:Point=17 // aSlicePosition.X 10658 // aSlicePosition.Y diff --git a/chart2/qa/extras/chart2dump/reference/piecharttest/rotated_pie_chart.txt b/chart2/qa/extras/chart2dump/reference/piecharttest/rotated_pie_chart.txt index 099db99..e1a3708 100755 --- a/chart2/qa/extras/chart2dump/reference/piecharttest/rotated_pie_chart.txt +++ b/chart2/qa/extras/chart2dump/reference/piecharttest/rotated_pie_chart.txt @@ -3,7 +3,7 @@ /// Series 0 slices // nSlicesCountInSeries 3 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,11004,5159,14330,5146/D=0:CS=0:CT=0:Series=0:Point=0 +/// /D=0:CS=0:CT=0:Series=0:Point=0 // aSlicePosition.X 7679 // aSlicePosition.Y @@ -18,7 +18,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 17798 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,5548,7725,3417,10279/D=0:CS=0:CT=0:Series=0:Point=1 +/// /D=0:CS=0:CT=0:Series=0:Point=1 // aSlicePosition.X 4353 // aSlicePosition.Y @@ -33,7 +33,7 @@ 1 // static_cast<sal_Int32>(aSliceFillColor) 16728590 -/// CID/MultiClick:DragMethod=PieSegmentDraging:DragParameter=0,7334,1863,6990,-1444/D=0:CS=0:CT=0:Series=0:Point=2 +/// /D=0:CS=0:CT=0:Series=0:Point=2 // aSlicePosition.X 4925 // aSlicePosition.Y
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits