summaryrefslogtreecommitdiff
path: root/oox/source/core/xmlfilterbase.cxx
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2019-05-13 16:23:38 +0200
committerLászló Németh <nemeth@numbertext.org>2019-05-14 08:19:45 +0200
commit642389768e634b739a1d8354259b16bfcc695d17 (patch)
tree004ed75ba1994ca1ae62c0bb26b0f49e73597272 /oox/source/core/xmlfilterbase.cxx
parentd1fcb0ec92ea7935b9f92a15a922fb9dccfe1968 (diff)
tdf#100084 XLSX import: fix missing charts clean-up
Clean-up the b2fc2ad7beceaff660de684435a5c37d69cf8ae9 commit. Change-Id: I625373d9661cbe4528ca487af0aef356b40af2e7 Reviewed-on: https://gerrit.libreoffice.org/72237 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox/source/core/xmlfilterbase.cxx')
-rw-r--r--oox/source/core/xmlfilterbase.cxx9
1 files changed, 5 insertions, 4 deletions
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);
}
}