diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-07-15 13:24:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-15 06:17:47 +0000 |
| commit | 5bbff06137a87e97260a188f6745cf2a227f15cf (patch) | |
| tree | 9934fcebcc6daff6c47a4f3b50bcc6398cbe1e6a /fpicker/source/win32/filepicker/VistaFilePicker.hxx | |
| parent | 2639eadce4c9ccead9112a6893b5e9e2e0fefd78 (diff) | |
[API CHANGE] XFilePicker2/3 changes for multiselection
In order to use GetSelectedFiles (in XFilePicker2) instead of GetFiles (in XFilePicker),
here are some api changes
before:
XFilePicker3 inherits from XFilePicker
XFilePicker2 is not a published interface
after:
XFilePicker3 inherits from XFilePicker2
XFilePicker2 is a published interface
+ adapt Uno Implementations
Change-Id: If44afaa7236f08bc2b814f91eda5bfad333dd799
Reviewed-on: https://gerrit.libreoffice.org/17068
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'fpicker/source/win32/filepicker/VistaFilePicker.hxx')
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePicker.hxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx index f133303609a6..01b6da335893 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/ui/dialogs/XFilePicker2.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/XFilePreview.hpp> @@ -45,7 +44,6 @@ namespace vista{ typedef ::cppu::WeakComponentImplHelper< - css::ui::dialogs::XFilePicker2, css::ui::dialogs::XFilePicker3, css::ui::dialogs::XFilePickerControlAccess, css::ui::dialogs::XFilePreview, @@ -112,12 +110,9 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( css::uno::RuntimeException ); - // XFilePicker2 functions - - virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles( ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // XFilterManager functions |