Kaydet (Commit) c6c14f6a authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: rhbz#1715109 add All files to the graphic import dialog

to pick up things without extensions, for consistency with file->open

Change-Id: Ib119fb0d053d1d288eee7cd17fa4f12dcb9956d7
Reviewed-on: https://gerrit.libreoffice.org/73276
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f51544e4
...@@ -1896,12 +1896,24 @@ void FileDialogHelper_Impl::addGraphicFilter() ...@@ -1896,12 +1896,24 @@ void FileDialogHelper_Impl::addGraphicFilter()
bool bIsInOpenMode = isInOpenMode(); bool bIsInOpenMode = isInOpenMode();
try try
{
// if the extension is not "All files", insert "All images"
if (aExtensions != FILEDIALOG_FILTER_ALL)
{ {
OUString aAllFilterName = SfxResId(STR_SFX_IMPORT_ALL_IMAGES); OUString aAllFilterName = SfxResId(STR_SFX_IMPORT_ALL_IMAGES);
aAllFilterName = ::sfx2::addExtension( aAllFilterName, aExtensions, bIsInOpenMode, *this ); aAllFilterName = ::sfx2::addExtension( aAllFilterName, aExtensions, bIsInOpenMode, *this );
xFltMgr->appendFilter( aAllFilterName, aExtensions ); xFltMgr->appendFilter( aAllFilterName, aExtensions );
maSelectFilter = aAllFilterName; 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 );
// if the extension is "All files", make that the default
if (aExtensions == FILEDIALOG_FILTER_ALL)
maSelectFilter = maSelectFilter;
} }
catch( const IllegalArgumentException& ) catch( const IllegalArgumentException& )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment