[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Michael Weghorn (via logerrit)]

 sw/source/uibase/dbui/dbmgr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d5071b7993cb8eca21008989b3ef7b4d82f95e7
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Nov 7 10:21:12 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Nov 12 16:45:14 2019 +0100

    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 at 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 at redhat.com>

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: