diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-04 21:04:18 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-07 14:19:34 +0000 |
| commit | f1abe3035cc237609dc4d20f3dd9c6e2484ef7a8 (patch) | |
| tree | d30103ffb6561bc5071ca625634de718a400d000 /sfx2 | |
| parent | 17084c750df84e0da377d716a4088f72bd25f972 (diff) | |
gtk: cleanup to make the vcl file-picker interface work.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/filedlghelper.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index 291897d2eb8d..215759021ab4 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -99,7 +99,6 @@ class Window; #define FILE_OPEN_SERVICE_NAME "com.sun.star.ui.dialogs.FilePicker" #define FOLDER_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.FolderPicker" -#define FILE_OPEN_SERVICE_NAME_SYSTEM "com.sun.star.ui.dialogs.SystemFilePicker" #define FILE_OPEN_SERVICE_NAME_OOO "com.sun.star.ui.dialogs.OfficeFilePicker" //----------------------------------------------------------------------------- diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 0a647687dfb4..56b0868a2be4 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -842,21 +842,21 @@ ErrCode FileDialogHelper_Impl::getGraphic( Graphic& rGraphic ) const } // ------------------------------------------------------------------------ -sal_Bool lcl_isSystemFilePicker( const uno::Reference< XFilePicker >& _rxFP ) +static bool lcl_isSystemFilePicker( const uno::Reference< XFilePicker >& _rxFP ) { try { uno::Reference< XServiceInfo > xSI( _rxFP, UNO_QUERY ); - if ( xSI.is() && xSI->supportsService( DEFINE_CONST_OUSTRING( "com.sun.star.ui.dialogs.SystemFilePicker" ) ) ) - return sal_True; + if ( !xSI.is() ) + return true; + return xSI->supportsService( DEFINE_CONST_OUSTRING( "com.sun.star.ui.dialogs.SystemFilePicker" ) ); } catch( const Exception& ) { } - return sal_False; + return false; } - // ------------------------------------------------------------------------ // ----------- FileDialogHelper_Impl --------------------------- // ------------------------------------------------------------------------ |