diff options
-rw-r--r-- | chart2/qa/extras/chart2export.cxx | 9 | ||||
-rw-r--r-- | chart2/qa/extras/data/odt/axis-position.odt | bin | 21224 -> 0 bytes | |||
-rw-r--r-- | oox/source/export/chartexport.cxx | 7 |
3 files changed, 0 insertions, 16 deletions
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 Binary files differdeleted file mode 100644 index 35ea152aa0d9..000000000000 --- a/chart2/qa/extras/data/odt/axis-position.odt +++ /dev/null diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index b60c2b711058..5438db381c2f 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2828,13 +2828,6 @@ void ChartExport::_exportAxis( exportTextProps(xAxisProp); - if (nAxisType == XML_valAx) - { - pFS->singleElement( FSNS( XML_c, XML_crossBetween ), - XML_val, "midCat", - FSEND ); - } - pFS->singleElement( FSNS( XML_c, XML_crossAx ), XML_val, I32S( rAxisIdPair.nCrossAx ), FSEND ); |