Kaydet (Commit) 694419d8 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Markus Mohrhard

Related: tdf#93676 in msword chart appears with axis positioned between ticks

Change-Id: Ibd16d255a45a220faf7681a74785549c32969f78
üst c70d0129
......@@ -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();
......
......@@ -2896,6 +2896,17 @@ void ChartExport::_exportAxis(
FSEND );
}
// TODO: MSO does not support random axis cross position for
// category axis, so we ideally need an algorithm that decides
// when to map the crossing to the tick mark and when to the
// middle of the category
if (nAxisType == XML_valAx)
{
pFS->singleElement( FSNS( XML_c, XML_crossBetween ),
XML_val, "midCat",
FSEND );
}
// majorUnit
bool bAutoStepMain = false;
if(GetProperty( xAxisProp, "AutoStepMain" ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment