summaryrefslogtreecommitdiff
path: root/sd/source/ui/func/fuinsfil.cxx
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2017-08-07 22:31:58 +0900
committerKatarina Behrens <Katarina.Behrens@cib.de>2017-08-08 11:28:19 +0200
commit99f3d9895f63ed19496bbe47bd36899b0f39dbce (patch)
tree4119e00d789fc1b20d839d9ee2db2ed06edec499 /sd/source/ui/func/fuinsfil.cxx
parent06283dcba13ee18716da9eee728210a00bcb5b97 (diff)
tdf#95309 Add a filter to show all files for "Insert > File"
in Draw and Impress. Change-Id: Ia6721f4a25af9fe8b6edd143ecb7ba3f5f3e8a89 Reviewed-on: https://gerrit.libreoffice.org/40834 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sd/source/ui/func/fuinsfil.cxx')
-rw-r--r--sd/source/ui/func/fuinsfil.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 3bcbc78db3dc..d72701c527e9 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -214,15 +214,15 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
++aOtherIter;
}
- // set default-filter (<All>)
- OUString aAllSpec( SdResId( STR_ALL_FILES ) );
+ // set "All supported formats" as the default filter
+ OUString aAllSpec( SdResId( STR_ALL_SUPPORTED_FORMATS ) );
OUString aExtensions = lcl_GetExtensionsList( aFilterVector );
OUString aGUIName = aAllSpec + " (" + aExtensions + ")";
xFilterManager->appendFilter( aGUIName, aExtensions );
xFilterManager->setCurrentFilter( aAllSpec );
- // add filters to filter manager finally
+ // append individual filters
::std::vector< ::std::pair < OUString, OUString > >::const_iterator aIter( aFilterVector.begin() );
while( aIter != aFilterVector.end() )
@@ -231,6 +231,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
++aIter;
}
+ // end with "All files" as fallback
+ xFilterManager->appendFilter( SdResId( STR_ALL_FILES ), "*.*" );
}
catch (const IllegalArgumentException&)
{