diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-04 19:00:45 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-04 21:17:40 +0100 |
| commit | bbaad88a5c5643365afc438fc53e864e4233a628 (patch) | |
| tree | d825ac1d323ff058a466931f18087261b4374042 | |
| parent | b455abb0138a3f296e0d9a833c0d3c205295d78a (diff) | |
Revert "fdo#75200:Libreoffice crash while opening the file"
This reverts commit 0b6a1f2afa7954afcf1f27b066169455ed6cff7a.
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 10 | ||||
| -rw-r--r-- | chart2/qa/extras/data/docx/barChart.docx | bin | 40092 -> 0 bytes | |||
| -rw-r--r-- | oox/source/helper/propertymap.cxx | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 17940fec8559..2d4259b1102b 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -34,7 +34,6 @@ public: void testPPTChartSeries(); void testODPChartSeries(); void testBnc864396(); - void testChartFileOpen(); CPPUNIT_TEST_SUITE(Chart2ImportTest); CPPUNIT_TEST(Fdo60083); @@ -46,7 +45,6 @@ public: CPPUNIT_TEST(testODTChartSeries); CPPUNIT_TEST(testDOCChartSeries); CPPUNIT_TEST(testDOCXChartSeries); - CPPUNIT_TEST(testChartFileOpen); /* * Disabling Impress Uts. * ChartTest::tearDown() calls dispose of mxComponent @@ -262,6 +260,7 @@ 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() @@ -271,6 +270,7 @@ 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,6 +280,7 @@ 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() @@ -297,11 +298,6 @@ 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 Binary files differdeleted file mode 100644 index 9b9152bca725..000000000000 --- a/chart2/qa/extras/data/docx/barChart.docx +++ /dev/null diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 968aea17301b..5e27b44b847b 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -267,11 +267,8 @@ void PropertyMap::fillSequences( Sequence< OUString >& rNames, Sequence< Any >& for( PropertyMapType::const_iterator aIt = maProperties.begin(), aEnd = maProperties.end(); aIt != aEnd; ++aIt, ++pNames, ++pValues ) { OSL_ENSURE( (0 <= aIt->first) && (aIt->first < PROP_COUNT), "PropertyMap::fillSequences - invalid property identifier" ); - if((sal_uInt32)aIt->first <= mpPropNames->size()) - { - *pNames = (*mpPropNames)[ aIt->first ]; - *pValues = aIt->second; - } + *pNames = (*mpPropNames)[ aIt->first ]; + *pValues = aIt->second; } } } |