fdo#46808, Adapt ui::dialogs::FilePicker UNO service to new style

Change-Id: I1cafbfc53994e5d74241042dbd1d292ddbda67d5

4 files changed, 16 insertions, 48 deletions

diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 19c9e5fe81fe..16925551d348 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -87,16 +87,10 @@ namespace
 //////////////////////////////////////////////////////////////////////////
 
 UnxFilePicker::UnxFilePicker( const uno::Reference<uno::XComponentContext>& )
-    : cppu::WeakComponentImplHelper9<
-          XFilterManager,
-          XFilterGroupManager,
-          XFilePickerControlAccess,
-          XFilePickerNotifier,
+    : cppu::WeakComponentImplHelper3<
 // TODO   XFilePreview,
           XFilePicker2,
-          lang::XInitialization,
-          util::XCancellable,
-          lang::XEventListener,
+          XFilePicker3,
           lang::XServiceInfo>( m_rbHelperMtx ),
           m_nFilePickerPid( -1 ),
           m_nFilePickerWrite( -1 ),
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 8f11bf35c655..4eab1833f23a 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -20,21 +20,16 @@
 #ifndef _UNXFILEPICKER_HXX_
 #define _UNXFILEPICKER_HXX_
 
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase4.hxx>
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePreview.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>
-#include <com/sun/star/util/XCancellable.hpp>
 
 #include <list>
 
@@ -51,16 +46,11 @@ protected:
 
 class UnxFilePicker :
     public UnxFilePickerDummy,
-    public cppu::WeakComponentImplHelper9<
-        ::com::sun::star::ui::dialogs::XFilterManager,
-        ::com::sun::star::ui::dialogs::XFilterGroupManager,
-        ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-        ::com::sun::star::ui::dialogs::XFilePickerNotifier,
+    public cppu::WeakComponentImplHelper4<
         ::com::sun::star::ui::dialogs::XFilePicker2,
+        ::com::sun::star::ui::dialogs::XFilePicker3,
+        ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
 // TODO ::com::sun::star::ui::dialogs::XFilePreview,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::util::XCancellable,
-        ::com::sun::star::lang::XEventListener,
         ::com::sun::star::lang::XServiceInfo >
 {
 protected:
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 57594147a36e..3365991e9ea4 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -105,16 +105,9 @@ QString toQString(const rtl::OUString& s)
 //////////////////////////////////////////////////////////////////////////
 
 KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
-    : cppu::WeakComponentImplHelper9<
-          XFilterManager,
-          XFilterGroupManager,
-          XFilePickerControlAccess,
-          XFilePickerNotifier,
-// TODO   XFilePreview,
+    : cppu::WeakComponentImplHelper3<
           XFilePicker2,
-          lang::XInitialization,
-          util::XCancellable,
-          lang::XEventListener,
+          XFilePicker3,
           lang::XServiceInfo>( _helperMutex ),
           _resMgr( ResMgr::CreateResMgr("fps_office") )
 {
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 6b17e1ee7df3..04c15b5c9af2 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -19,17 +19,13 @@
 
 #pragma once
 
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase4.hxx>
 
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.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>
-#include <com/sun/star/util/XCancellable.hpp>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
@@ -46,16 +42,11 @@ class QLayout;
 class ResMgr;
 
 class KDE4FilePicker :
-    public cppu::WeakComponentImplHelper9<
-        ::com::sun::star::ui::dialogs::XFilterManager,
-        ::com::sun::star::ui::dialogs::XFilterGroupManager,
+    public cppu::WeakComponentImplHelper4<
+        ::com::sun::star::ui::dialogs::XFilePicker2,
+        ::com::sun::star::ui::dialogs::XFilePicker3,
         ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-        ::com::sun::star::ui::dialogs::XFilePickerNotifier,
 // TODO ::com::sun::star::ui::dialogs::XFilePreview,
-        ::com::sun::star::ui::dialogs::XFilePicker2,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::util::XCancellable,
-        ::com::sun::star::lang::XEventListener,
         ::com::sun::star::lang::XServiceInfo >
 {
 protected: