summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-04-18 11:33:10 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-04-19 03:03:23 +0200
commit7bb87abc0cc7bf17af62117b65e18bc007573e6e (patch)
tree480f6421c3a79aa743f6496e6653ad1f32967957
parentc4a267215c10647ff281e9e629faa0a8a201f4b4 (diff)
fix upDown bar export to OOXML
We should not really export it as this leads to wrong import into MSO. Change-Id: I94897eef040af0785acb3c7615ce6f5b5a96f055
-rw-r--r--chart2/qa/extras/chart2export.cxx2
-rw-r--r--oox/source/export/chartexport.cxx3
2 files changed, 5 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 40143938ef35..e13870c1ac6b 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -601,10 +601,12 @@ void Chart2ExportTest::testAreaChartLoad()
void Chart2ExportTest::testUpDownBars()
{
+ /*
load("/chart2/qa/extras/data/docx/", "UpDownBars.docx");
xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars");
+ */
}
void Chart2ExportTest::testDoughnutChart()
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 63d77659ec8a..05f751838c27 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1608,6 +1608,9 @@ void ChartExport::exportHiLowLines()
void ChartExport::exportUpDownBars( Reference< chart2::XChartType > xChartType)
{
+ if(xChartType->getChartType() != "com.sun.star.chart2.CandleStickChartType")
+ return;
+
FSHelperPtr pFS = GetFS();
// export the chart property
Reference< ::com::sun::star::chart::XStatisticDisplay > xChartPropProvider( mxDiagram, uno::UNO_QUERY );