diff options
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 14 | ||||
| -rw-r--r-- | chart2/qa/extras/data/odp/tdf121189.odp | bin | 0 -> 16945 bytes | |||
| -rw-r--r-- | oox/source/export/shapes.cxx | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index fddfdc0c2e67..7e17c2f1307c 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -156,6 +156,7 @@ public: void testTdf119029(); void testTdf108022(); void testTdf121744(); + void testTdf121189(); void testTdf122031(); void testTdf115012(); void testTdf134118(); @@ -295,6 +296,7 @@ public: CPPUNIT_TEST(testTdf119029); CPPUNIT_TEST(testTdf108022); CPPUNIT_TEST(testTdf121744); + CPPUNIT_TEST(testTdf121189); CPPUNIT_TEST(testTdf122031); CPPUNIT_TEST(testTdf115012); CPPUNIT_TEST(testTdf134118); @@ -2577,6 +2579,18 @@ void Chart2ExportTest::testTdf121744() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val", YValueId ); } +void Chart2ExportTest::testTdf121189() +{ + load("/chart2/qa/extras/data/odp/", "tdf121189.odp"); + reload("Impress Office Open XML"); + + uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY_THROW); + uno::Reference<drawing::XDrawPage> xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xPage->getCount()); + uno::Reference<drawing::XShape> xShape(xPage->getByIndex(0), uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.OLE2Shape"), xShape->getShapeType()); +} + void Chart2ExportTest::testTdf122031() { //Checks pie chart data label format. diff --git a/chart2/qa/extras/data/odp/tdf121189.odp b/chart2/qa/extras/data/odp/tdf121189.odp Binary files differnew file mode 100644 index 000000000000..6f99e0054936 --- /dev/null +++ b/chart2/qa/extras/data/odp/tdf121189.odp diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 3121aa745a16..e7997226f689 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1490,6 +1490,7 @@ static const NameToConvertMapType& lcl_GetConverters() { "com.sun.star.presentation.GraphicObjectShape" , &ShapeExport::WriteGraphicObjectShape }, { "com.sun.star.presentation.MediaShape" , &ShapeExport::WriteGraphicObjectShape }, + { "com.sun.star.presentation.ChartShape" , &ShapeExport::WriteOLE2Shape }, { "com.sun.star.presentation.OLE2Shape" , &ShapeExport::WriteOLE2Shape }, { "com.sun.star.presentation.TableShape" , &ShapeExport::WriteTableShape }, { "com.sun.star.presentation.TextShape" , &ShapeExport::WriteTextShape }, |