diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-03 12:20:16 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-03 12:20:16 +0000 |
| commit | 818884ebc168b595c4f7bc43e52b00ada5134b03 (patch) | |
| tree | a8cbb111df131f8acf315cc96abe7b3011665be1 /fpicker | |
| parent | 31b6adb8f40afeab7d16c58b6a58d4e03c6d321d (diff) | |
INTEGRATION: CWS fpicker6 (1.8.18); FILE MERGED
2006/08/01 17:45:25 cmc 1.8.18.1: #i63263# multiselect support
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/unx/gnome/SalGtkFilePicker.hxx | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx index 0b7cd2100b9f..bd552d1ab256 100644 --- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx +++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx @@ -4,9 +4,9 @@ * * $RCSfile: SalGtkFilePicker.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2006-06-20 00:13:47 $ + * last change: $Author: ihi $ $Date: 2006-08-03 13:20:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,8 +40,8 @@ // includes of other projects //_______________________________________________________________________________________________________________________ -#ifndef _CPPUHELPER_COMPBASE9_HXX_ -#include <cppuhelper/compbase9.hxx> +#ifndef _CPPUHELPER_COMPBASE10_HXX_ +#include <cppuhelper/compbase10.hxx> #endif #ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ @@ -108,17 +108,18 @@ typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // c //---------------------------------------------------------- class SalGtkFilePicker : - public SalGtkPicker, - public cppu::WeakComponentImplHelper9< + public SalGtkPicker, + public cppu::WeakComponentImplHelper10< ::com::sun::star::ui::dialogs::XFilterManager, ::com::sun::star::ui::dialogs::XFilterGroupManager, ::com::sun::star::ui::dialogs::XFilePickerControlAccess, ::com::sun::star::ui::dialogs::XFilePickerNotifier, ::com::sun::star::ui::dialogs::XFilePreview, - ::com::sun::star::lang::XInitialization, + ::com::sun::star::ui::dialogs::XFilePickerWorkaround, + ::com::sun::star::lang::XInitialization, ::com::sun::star::util::XCancellable, - ::com::sun::star::lang::XEventListener, - ::com::sun::star::lang::XServiceInfo > + ::com::sun::star::lang::XEventListener, + ::com::sun::star::lang::XServiceInfo > { public: @@ -161,10 +162,17 @@ class SalGtkFilePicker : virtual ::rtl::OUString SAL_CALL getDisplayDirectory( ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( ) + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------------------------------------------ + // XFilePickerWorkaround functions + //------------------------------------------------------------------------------------ + + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFilesAsURIs() + throw (::com::sun::star::uno::RuntimeException); + + //------------------------------------------------------------------------------------ // XFilterManager functions //------------------------------------------------------------------------------------ |