summaryrefslogtreecommitdiff
path: root/chart2/qa/extras
diff options
context:
space:
mode:
authorPriyankaGaikwad <priyanka.gaikwad@synerzip.com>2014-02-19 17:08:02 +0530
committerCaolán McNamara <caolanm@redhat.com>2014-03-02 15:21:51 -0600
commit0b6a1f2afa7954afcf1f27b066169455ed6cff7a (patch)
tree40c78c75d9bfd367787ea35a89967a2cb9ee3204 /chart2/qa/extras
parente059218a83ddb5c0e3d5b4ae0ca932d281683edf (diff)
fdo#75200:Libreoffice crash while opening the file
Conflicts: chart2/qa/extras/chart2import.cxx Change-Id: Icb2a5bc43ef5fd0f307b43bbe8aaf892a043dc5b Reviewed-on: https://gerrit.libreoffice.org/8127 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/qa/extras')
-rw-r--r--chart2/qa/extras/chart2import.cxx10
-rw-r--r--chart2/qa/extras/data/docx/barChart.docxbin0 -> 40092 bytes
2 files changed, 7 insertions, 3 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 2d4259b1102b..17940fec8559 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -34,6 +34,7 @@ public:
void testPPTChartSeries();
void testODPChartSeries();
void testBnc864396();
+ void testChartFileOpen();
CPPUNIT_TEST_SUITE(Chart2ImportTest);
CPPUNIT_TEST(Fdo60083);
@@ -45,6 +46,7 @@ public:
CPPUNIT_TEST(testODTChartSeries);
CPPUNIT_TEST(testDOCChartSeries);
CPPUNIT_TEST(testDOCXChartSeries);
+ CPPUNIT_TEST(testChartFileOpen);
/*
* Disabling Impress Uts.
* ChartTest::tearDown() calls dispose of mxComponent
@@ -260,7 +262,6 @@ void Chart2ImportTest::testPPTChartSeries()
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]);
-
}
void Chart2ImportTest::testPPTXChartSeries()
@@ -270,7 +271,6 @@ void Chart2ImportTest::testPPTXChartSeries()
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[1]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[2]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[3]);
-
}
void Chart2ImportTest::testODPChartSeries()
@@ -280,7 +280,6 @@ void Chart2ImportTest::testODPChartSeries()
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]);
-
}
void Chart2ImportTest::testBnc864396()
@@ -298,6 +297,11 @@ void Chart2ImportTest::testBnc864396()
}
}
+void Chart2ImportTest::testChartFileOpen()
+{
+ load("/chart2/qa/extras/data/docx/", "barChart.docx");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/barChart.docx b/chart2/qa/extras/data/docx/barChart.docx
new file mode 100644
index 000000000000..9b9152bca725
--- /dev/null
+++ b/chart2/qa/extras/data/docx/barChart.docx
Binary files differ