summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2019-11-07 10:21:12 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-11-12 16:45:14 +0100
commit9d5071b7993cb8eca21008989b3ef7b4d82f95e7 (patch)
treee6027d0cc8b3b4d2e9f40f0211243af13f31e24a /sw
parent3cb7c012dd47f6feed748c15ec94c310e2ceb181 (diff)
tdf#109219 Allow files with spaces in name as MM data source
The filter needs to be the unescaped file name. Change-Id: I2b5337c184c1ce75595e129d5a87ed4d189ec1e7 Reviewed-on: https://gerrit.libreoffice.org/82201 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 47708d533e1325032df55eb667ef0c47fa05e7e5, plus follow-up fix ef21e0d527655761b6c307cae89ee5b370de96d4 "tdf#109219 MM: Decode all percent encodings in file names") Reviewed-on: https://gerrit.libreoffice.org/82209 Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 117f2f0c938b..03fd426d8409 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2774,7 +2774,7 @@ OUString LoadAndRegisterDataSource_Impl(DBConnURIType type, const uno::Reference
case DBConnURIType::FLAT:
case DBConnURIType::DBASE:
//set the filter to the file name without extension
- aFilters[0] = rURL.getBase();
+ aFilters[0] = rURL.getBase(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset);
aTableFilterAny <<= aFilters;
break;
case DBConnURIType::MSJET: