From 5bbff06137a87e97260a188f6745cf2a227f15cf Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Wed, 15 Jul 2015 13:24:07 +0200
Subject: [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>
---
 vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 1 -
 vcl/unx/kde4/KDE4FilePicker.hxx          | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'vcl/unx')

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index 1830f210ffb5..e55d2d29dd1d 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -48,7 +48,6 @@ typedef ::com::sun::star::uno::Sequence< UnoFilterEntry >   UnoFilterList;  // c
 typedef cppu::WeakComponentImplHelper<
         ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
         ::com::sun::star::ui::dialogs::XFilePreview,
-        ::com::sun::star::ui::dialogs::XFilePicker2,
         ::com::sun::star::ui::dialogs::XFilePicker3,
         ::com::sun::star::lang::XInitialization
         > SalGtkFilePicker_Base;
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index c29f4d89c355..186e57a29cbf 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -23,7 +23,6 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.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/uno/XComponentContext.hpp>
@@ -42,8 +41,7 @@ class QWidget;
 class QLayout;
 
 typedef ::cppu::WeakComponentImplHelper
-<   ::com::sun::star::ui::dialogs::XFilePicker2
-,   ::com::sun::star::ui::dialogs::XFilePicker3
+<   ::com::sun::star::ui::dialogs::XFilePicker3
 ,   ::com::sun::star::ui::dialogs::XFilePickerControlAccess
 // TODO ::com::sun::star::ui::dialogs::XFilePreview
 ,   ::com::sun::star::lang::XInitialization
-- 
cgit