diff options
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 2 | ||||
| -rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index affab028f46e..cd5e61d03f21 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -887,7 +887,7 @@ void Chart2ImportTest::testTdf108021() void Chart2ImportTest::testTdf100084() { - // The test file was created with IBM Cognos, so just check there is a diagram. + // The test file was created with IBM Cognos, make sure there is a diagram. load("/chart2/qa/extras/data/xlsx/", "tdf100084.xlsx"); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index be9b2261c272..6e26fa86595a 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -385,15 +385,16 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan handler to create specialized input streams, e.g. VML streams that have to preprocess the raw input data. */ Reference< XInputStream > xInStrm = rxHandler->openFragmentStream(); - // Check again the aFragmentPath route if there is no any file with lowercase letter. (tdf#100084) + /* tdf#100084 Check again the aFragmentPath route with lowercase file name + TODO: complete handling of case-insensitive file paths */ if ( !xInStrm.is() ) { sal_Int32 nPathLen = aFragmentPath.lastIndexOf('/') + 1; OUString fileName = aFragmentPath.copy(nPathLen); - if ( fileName != fileName.toAsciiLowerCase() ) + OUString sLowerCaseFileName = fileName.toAsciiLowerCase(); + if ( fileName != sLowerCaseFileName ) { - fileName = fileName.toAsciiLowerCase(); - aFragmentPath = OUStringBuffer(aFragmentPath.copy(0, nPathLen)).append(fileName).makeStringAndClear(); + aFragmentPath = aFragmentPath.copy(0, nPathLen) + sLowerCaseFileName; xInStrm = openInputStream(aFragmentPath); } } |