From 4635a86971b6183e4161e35d903da5e86706f382 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 6 Oct 2015 21:47:23 +0200 Subject: Simplify a bit 1) change if/else if/... into switch for readability 2) no need to use a #define for something which appears once Change-Id: Ia27d1bd07e4ed0761daa90df0f209c3a4c6cb8f0 --- include/sfx2/filedlghelper.hxx | 2 -- sfx2/source/dialog/filedlghelper.cxx | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 854703a89b15..67ec91e295fb 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -65,8 +65,6 @@ namespace vcl { class Window; } #define FILEDIALOG_FILTER_ALL "*.*" -#define FILE_OPEN_SERVICE_NAME_OOO "com.sun.star.ui.dialogs.OfficeFilePicker" - namespace sfx2 { class FileDialogHelper_Impl; diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index fdca859cd80c..1cc0a08d4901 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -858,14 +858,20 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( ,meContext ( FileDialogHelper::UNKNOWN_CONTEXT ) { const char* pServiceName=0; - if ( nDialog == SFX2_IMPL_DIALOG_SYSTEM ) - pServiceName = FILE_OPEN_SERVICE_NAME_OOO; - else if ( nDialog == SFX2_IMPL_DIALOG_OOO ) - pServiceName = FILE_OPEN_SERVICE_NAME_OOO; - else if ( nDialog == SFX2_IMPL_DIALOG_REMOTE ) - pServiceName = "com.sun.star.ui.dialogs.RemoteFilePicker"; - else - pServiceName = "com.sun.star.ui.dialogs.FilePicker"; + switch (nDialog) + { + case SFX2_IMPL_DIALOG_SYSTEM: + case SFX2_IMPL_DIALOG_OOO: + pServiceName = "com.sun.star.ui.dialogs.OfficeFilePicker"; + break; + case SFX2_IMPL_DIALOG_REMOTE: + pServiceName = "com.sun.star.ui.dialogs.RemoteFilePicker"; + break; + default: + pServiceName = "com.sun.star.ui.dialogs.FilePicker"; + break; + } + OUString aService = OUString::createFromAscii( pServiceName ); uno::Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); -- cgit