diff options
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 9 | ||||
| -rw-r--r-- | chart2/qa/extras/data/odt/axis-position.odt | bin | 0 -> 21224 bytes | |||
| -rw-r--r-- | oox/source/export/chartexport.cxx | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 1e73718ec2ab..7004e97a3368 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -99,6 +99,7 @@ public: void testBarChartVaryColorsXLSX(); void testMultipleAxisXLSX(); void testAxisTitleRotationXLSX(); + void testAxisCrossBetweenXSLX(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -162,6 +163,7 @@ public: CPPUNIT_TEST(testBarChartVaryColorsXLSX); CPPUNIT_TEST(testMultipleAxisXLSX); CPPUNIT_TEST(testAxisTitleRotationXLSX); + CPPUNIT_TEST(testAxisCrossBetweenXSLX); CPPUNIT_TEST_SUITE_END(); protected: @@ -1473,6 +1475,13 @@ 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 differnew file mode 100644 index 000000000000..35ea152aa0d9 --- /dev/null +++ b/chart2/qa/extras/data/odt/axis-position.odt diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 3c0fcaf58683..5851e0c00a7d 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2806,6 +2806,13 @@ 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 ); |