diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-03-30 12:54:05 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-03-30 12:55:25 +0200 |
| commit | e7384daa27c954efa6a66dda829f23d7ad1b2a01 (patch) | |
| tree | 6c6ffae2af90fd9196bb46d366a1195b1a4b1d2e /fpicker | |
| parent | 4fb1fb5297fa233d50ea0a31d6d54bb4ea9e00f1 (diff) | |
fdo#76778 fix wildcard support in File Open dialog
Change-Id: Ifbdf6847ddecc7848828247655e729dfe2299b30
Diffstat (limited to 'fpicker')
| -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 e850f7df3565..b3ba51bf3e41 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2490,6 +2490,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 ) { @@ -2498,8 +2499,10 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& r if ( INET_PROT_NOT_VALID != eProt && INET_PROT_FILE != eProt ) nQuestionMarkPos = -1; + + sal_Int32 nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos ); } - sal_Int32 nWildCardPos = std::min( rPath.indexOf( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos ); + rFilter = aEmpty; if ( nWildCardPos != -1 ) |