From 0ff4ec7f0a44af22794c2919a13978b3af1bb0b3 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard <markus.mohrhard@googlemail.com> Date: Tue, 8 Sep 2015 02:46:41 +0200 Subject: Revert "Related: tdf#93676 in msword chart appears with axis positioned between ticks" This reverts commit 10654c038c0bc20fb348be7164e08f3de98718f4. --- chart2/qa/extras/chart2export.cxx | 9 --------- chart2/qa/extras/data/odt/axis-position.odt | Bin 21224 -> 0 bytes 2 files changed, 9 deletions(-) delete mode 100644 chart2/qa/extras/data/odt/axis-position.odt (limited to 'chart2/qa') diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 7004e97a3368..1e73718ec2ab 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -99,7 +99,6 @@ public: void testBarChartVaryColorsXLSX(); void testMultipleAxisXLSX(); void testAxisTitleRotationXLSX(); - void testAxisCrossBetweenXSLX(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -163,7 +162,6 @@ public: CPPUNIT_TEST(testBarChartVaryColorsXLSX); CPPUNIT_TEST(testMultipleAxisXLSX); CPPUNIT_TEST(testAxisTitleRotationXLSX); - CPPUNIT_TEST(testAxisCrossBetweenXSLX); CPPUNIT_TEST_SUITE_END(); protected: @@ -1475,13 +1473,6 @@ void Chart2ExportTest::testAxisTitleRotationXLSX() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr", "rot", "0"); } -void Chart2ExportTest::testAxisCrossBetweenXSLX() -{ - load("/chart2/qa/extras/data/odt/", "axis-position.odt"); - xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); - assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat"); -} - CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/odt/axis-position.odt b/chart2/qa/extras/data/odt/axis-position.odt deleted file mode 100644 index 35ea152aa0d9..000000000000 Binary files a/chart2/qa/extras/data/odt/axis-position.odt and /dev/null differ -- cgit