diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-05-15 20:12:23 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-05-18 00:25:51 +0200 |
| commit | 21e1aa9d6b13b39b87435f8998c7ea6123a069fd (patch) | |
| tree | 69d75cb4aaf5bb9a5c2c20d38316d97012c4ecd4 /dbaccess | |
| parent | 90cf72f8a4988b4978c40d19ec7a4db314b97480 (diff) | |
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 <Katarina.Behrens@cib.de>
(cherry picked from commit dc17f247daeb281dda531ff335873d563db5b653)
Reviewed-on: https://gerrit.libreoffice.org/72453
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 9f1c2c6f58a6..06a6e7d8b720 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -701,7 +701,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<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetFrameWeld(), |