From dc17f247daeb281dda531ff335873d563db5b653 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Wed, 15 May 2019 20:12:23 +0200 Subject: [PATCH] tdf#125267: relax the requirement of fixed value of current filter In a filepicker, user can select any file filter ('All files' for example) and still choose to open .odb file. Specific UIName of the current filter ('ODF Database' in this case) shouldn't therefore be a hard requirement, the correct file extension is enough. Change-Id: I641a267c545c66aa4d34954922783cc5ff7efd24 Reviewed-on: https://gerrit.libreoffice.org/72377 Tested-by: Jenkins Reviewed-by: Katarina Behrens --- dbaccess/source/ui/dlg/generalpage.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 829333294d05..8f3fb2e79943 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -709,7 +709,10 @@ namespace dbaui if ( aFileDlg.Execute() == ERRCODE_NONE ) { OUString sPath = aFileDlg.GetPath(); - if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() || !pFilter->GetWildcard().Matches(sPath) ) + // check for aFileDlg.GetCurrentFilter used to be here but current fpicker filter + // can be set to anything, see tdf#125267 how this breaks if other value + // than 'ODF Database' is selected. Let's therefore check only if wildcard matches + if ( !pFilter->GetWildcard().Matches(sPath) ) { OUString sMessage(DBA_RES(STR_ERR_USE_CONNECT_TO)); std::unique_ptr xInfoBox(Application::CreateMessageDialog(GetFrameWeld(),