diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2020-08-25 16:01:22 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-08-25 16:05:39 +0200 |
| commit | 445836c853b07723a1bca6eb0d9876313fc30609 (patch) | |
| tree | a8b850d64e33f006d8f1c5146e5e16b924d6da2b /chart2 | |
| parent | afac39ff8a614f3efbc0c3e2d75ad81e1da8792d (diff) | |
Revert tdf#128733 fix due to reggression
This reverts commit 71f9961488232697bcdb37db349569a20f15bb2d.
Change-Id: I6a930fecbf2e82f9c9765b9ed0aa983a6b45ddbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101327
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 17 | ||||
| -rw-r--r-- | chart2/qa/extras/data/odt/tdf128733.odt | bin | 13708 -> 0 bytes | |||
| -rw-r--r-- | chart2/source/tools/AxisHelper.cxx | 1 |
3 files changed, 0 insertions, 18 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 103016fe7fc8..383196d774d4 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -137,7 +137,6 @@ public: void testTdf114179(); void testTdf124243(); void testTdf127393(); - void testTdf128733(); void testTdf128432(); void testTdf128627(); void testTdf128634(); @@ -240,7 +239,6 @@ public: CPPUNIT_TEST(testTdf114179); CPPUNIT_TEST(testTdf124243); CPPUNIT_TEST(testTdf127393); - CPPUNIT_TEST(testTdf128733); CPPUNIT_TEST(testTdf128432); CPPUNIT_TEST(testTdf128627); CPPUNIT_TEST(testTdf128634); @@ -2088,21 +2086,6 @@ void Chart2ImportTest::testTdf127393() CPPUNIT_ASSERT(!aScaleData2.ShiftedCategoryPosition); } -void Chart2ImportTest::testTdf128733() -{ - load("/chart2/qa/extras/data/odt/", "tdf128733.odt"); - - Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); - CPPUNIT_ASSERT(xChartDoc.is()); - // test secondary X axis ShiftedCategoryPosition value - Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 1); - CPPUNIT_ASSERT(xAxis.is()); - - chart2::ScaleData aScaleData = xAxis->getScaleData(); - CPPUNIT_ASSERT(aScaleData.Categories.is()); - CPPUNIT_ASSERT(aScaleData.ShiftedCategoryPosition); -} - void Chart2ImportTest::testTdf128432() { load("/chart2/qa/extras/data/ods/", "tdf128432.ods"); diff --git a/chart2/qa/extras/data/odt/tdf128733.odt b/chart2/qa/extras/data/odt/tdf128733.odt Binary files differdeleted file mode 100644 index 18aace26c02d..000000000000 --- a/chart2/qa/extras/data/odt/tdf128733.odt +++ /dev/null diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 75d51c610e11..6ec3d44f48d4 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -364,7 +364,6 @@ Reference< XAxis > AxisHelper::createAxis( aScale.AutoDateAxis = aMainScale.AutoDateAxis; aScale.Categories = aMainScale.Categories; aScale.Orientation = aMainScale.Orientation; - aScale.ShiftedCategoryPosition = aMainScale.ShiftedCategoryPosition; xAxis->setScaleData( aScale ); |