From bcb05a5daba9aafdc3921322676f33e055413f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 31 May 2019 15:33:00 +0100 Subject: [PATCH] Resolves: rhbz#1715109 add All files to the graphic import dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to pick up things without extensions, for consistency with file->open Reviewed-on: https://gerrit.libreoffice.org/73276 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit c6c14f6ae7f6d7768b450e7776db917bb662f3cf) Change-Id: Ib119fb0d053d1d288eee7cd17fa4f12dcb9956d7 --- sfx2/source/dialog/filedlghelper.cxx | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 3820ee4107c9..737dcb278a2a 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1872,11 +1872,23 @@ void FileDialogHelper_Impl::addGraphicFilter() try { - OUString aAllFilterName = SfxResId( STR_SFX_IMPORT_ALL ); - aAllFilterName = ::sfx2::addExtension( aAllFilterName, aExtensions, bIsInOpenMode, *this ); + // if the extension is not "All files", insert "All images" + if (aExtensions != FILEDIALOG_FILTER_ALL) + { + OUString aAllFilterName = SfxResId(STR_SFX_IMPORT_ALL); + aAllFilterName = ::sfx2::addExtension( aAllFilterName, aExtensions, bIsInOpenMode, *this ); + xFltMgr->appendFilter( aAllFilterName, aExtensions ); + maSelectFilter = aAllFilterName; // and make it the default + } + + // rhbz#1715109 always include All files *.* or * + OUString aAllFilesName = SfxResId( STR_SFX_FILTERNAME_ALL ); + aAllFilesName = ::sfx2::addExtension( aAllFilesName, FILEDIALOG_FILTER_ALL, bIsInOpenMode, *this ); + xFltMgr->appendFilter( aAllFilesName, FILEDIALOG_FILTER_ALL ); - xFltMgr->appendFilter( aAllFilterName, aExtensions ); - maSelectFilter = aAllFilterName; + // if the extension is "All files", make that the default + if (aExtensions == FILEDIALOG_FILTER_ALL) + maSelectFilter = aAllFilesName; } catch( const IllegalArgumentException& ) { -- 2.21.0