diff options
author | Andras Timar <andras.timar@collabora.com> | 2014-03-30 12:54:05 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-31 10:52:07 +0000 |
commit | 0094a8c95c901d22fd56e9613f017fa8be3affd5 (patch) | |
tree | 15934fc01e66b5cbafa79243518cb27afb3a86a3 | |
parent | 9ae833b62956a6d86772e2d2bf83a7391f322b00 (diff) |
fdo#76778 fix wildcard support in File Open dialog
Change-Id: Ifbdf6847ddecc7848828247655e729dfe2299b30
Reviewed-on: https://gerrit.libreoffice.org/8791
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
-rw-r--r-- | fpicker/source/office/iodlg.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 009b61d7fcb0..428b8e256e7f 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2489,6 +2489,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& r OUString aEmpty; OUString aReversePath = comphelper::string::reverseString(rPath); sal_Int32 nQuestionMarkPos = rPath.indexOf( '?' ); + sal_Int32 nWildCardPos = rPath.indexOf( FILEDIALOG_DEF_WILDCARD ); if ( nQuestionMarkPos != -1 ) { @@ -2497,8 +2498,10 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& r if ( INET_PROT_NOT_VALID != eProt && INET_PROT_FILE != eProt ) nQuestionMarkPos = -1; + + nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos ); } - sal_Int32 nWildCardPos = std::min( rPath.indexOf( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos ); + rFilter = aEmpty; if ( nWildCardPos != -1 ) |