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 /offapi | |
parent | show the correct color in the custom color picker in chart sidebar (diff) | |
download | core-5bbff06137a87e97260a188f6745cf2a227f15cf.tar.gz core-5bbff06137a87e97260a188f6745cf2a227f15cf.zip |
[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 'offapi')
-rw-r--r-- | offapi/com/sun/star/ui/dialogs/XFilePicker2.idl | 2 | ||||
-rw-r--r-- | offapi/com/sun/star/ui/dialogs/XFilePicker3.idl | 4 | ||||
-rw-r--r-- | offapi/type_reference/offapi.idl | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl index 91189a6f9f15..b04517f517f7 100644 --- a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl +++ b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl @@ -27,7 +27,7 @@ module com { module sun { module star { module ui { module dialogs { /** extends file picker interface to workaround some design problems. */ -interface XFilePicker2 : ::com::sun::star::ui::dialogs::XFilePicker +published interface XFilePicker2 : ::com::sun::star::ui::dialogs::XFilePicker { /** Returns a sequence of the selected files including path information in URL format, conforming to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>. diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker3.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker3.idl index c33e8eb4cdbd..d2ee0e2d72f6 100644 --- a/offapi/com/sun/star/ui/dialogs/XFilePicker3.idl +++ b/offapi/com/sun/star/ui/dialogs/XFilePicker3.idl @@ -22,7 +22,7 @@ #include <com/sun/star/lang/XComponent.idl> #include <com/sun/star/util/XCancellable.idl> -#include <com/sun/star/ui/dialogs/XFilePicker.idl> +#include <com/sun/star/ui/dialogs/XFilePicker2.idl> #include <com/sun/star/ui/dialogs/XFilePickerNotifier.idl> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.idl> #include <com/sun/star/ui/dialogs/XFilterManager.idl> @@ -40,7 +40,7 @@ module com { module sun { module star { module ui { module dialogs { */ published interface XFilePicker3 { - interface XFilePicker; + interface XFilePicker2; /** Provides the ability to request notifications about changes. */ diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl index f95e6b7f1844..c4bd5c4b1322 100644 --- a/offapi/type_reference/offapi.idl +++ b/offapi/type_reference/offapi.idl @@ -16956,8 +16956,12 @@ module com { void setCurrentFilter([in] string aTitle) raises (::com::sun::star::lang::IllegalArgumentException); string getCurrentFilter(); }; - published interface XFilePicker3 { + published interface XFilePicker2 { interface ::com::sun::star::ui::dialogs::XFilePicker; + sequence< string > getSelectedFiles(); + }; + published interface XFilePicker3 { + interface ::com::sun::star::ui::dialogs::XFilePicker2; interface ::com::sun::star::ui::dialogs::XFilePickerNotifier; interface ::com::sun::star::ui::dialogs::XFilterManager; interface ::com::sun::star::ui::dialogs::XFilterGroupManager; |