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

Change-Id: I1cafbfc53994e5d74241042dbd1d292ddbda67d5

5 files changed, 21 insertions, 56 deletions

diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 608c185d1a9f..fbf7ac7b70f8 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -20,13 +20,9 @@
 #ifndef _SALAQUAFILEPICKER_HXX_
 #define _SALAQUAFILEPICKER_HXX_
 
-#include <cppuhelper/compbase8.hxx>
-#include <com/sun/star/util/XCancellable.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
+#include <cppuhelper/compbase3.hxx>
 #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/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
 
@@ -53,14 +49,9 @@
 
 class SalAquaFilePicker :
     public SalAquaPicker,
-    public cppu::WeakComponentImplHelper8<
-    ::com::sun::star::ui::dialogs::XFilterManager,
-    ::com::sun::star::ui::dialogs::XFilterGroupManager,
+    public cppu::WeakComponentImplHelper3<
+    ::com::sun::star::ui::dialogs::XFilePicker3,
     ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-    ::com::sun::star::ui::dialogs::XFilePickerNotifier,
-    ::com::sun::star::lang::XInitialization,
-    ::com::sun::star::util::XCancellable,
-    ::com::sun::star::lang::XEventListener,
     ::com::sun::star::lang::XServiceInfo >
 {
 public:
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index fc7562b7d3c9..66355485bd41 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -92,11 +92,12 @@ namespace
 // constructor
 //-----------------------------------------------------------------------------------------
 
-SalAquaFilePicker::SalAquaFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr ) :
-cppu::WeakComponentImplHelper8<XFilterManager, XFilterGroupManager, XFilePickerControlAccess, XFilePickerNotifier,
- lang::XInitialization, util::XCancellable, lang::XEventListener, lang::XServiceInfo>( m_rbHelperMtx )
-, m_xServiceMgr( xServiceMgr )
-, m_pFilterHelper( NULL )
+SalAquaFilePicker::SalAquaFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr )
+  : cppu::WeakComponentImplHelper2<
+             XFilePicker3,
+             lang::XServiceInfo>( m_rbHelperMtx )
+   , m_xServiceMgr( xServiceMgr )
+   , m_pFilterHelper( NULL )
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
 
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index cc6691e8b1ad..09924f567c84 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -67,16 +67,9 @@ namespace
 //-----------------------------------------------------------------------------------------
 
 CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) :
-    cppu::WeakComponentImplHelper10<
-        XFilterManager,
-        XFilterGroupManager,
-        XFilePickerControlAccess,
-        XFilePickerNotifier,
-        XFilePreview,
+    cppu::WeakComponentImplHelper3<
         XFilePicker2,
-        lang::XInitialization,
-        util::XCancellable,
-        lang::XEventListener,
+        XFilePicker3,
         lang::XServiceInfo>(m_rbHelperMtx),
         m_xServiceMgr(xServiceMgr),
         m_aAsyncEventNotifier(rBHelper)
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 4e84d4821277..059c81f273ad 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -20,17 +20,12 @@
 #ifndef _FILEPICKER_HXX_
 #define _FILEPICKER_HXX_
 
-#include <cppuhelper/compbase10.hxx>
+#include <cppuhelper/compbase5.hxx>
 #include <osl/mutex.hxx>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker2.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/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
-#include <com/sun/star/util/XCancellable.hpp>
 #include "asynceventnotifier.hxx"
 #include "eventnotification.hxx"
 
@@ -59,16 +54,11 @@ protected:
 
 class CFilePicker :
     public CFilePickerDummy,
-    public cppu::WeakComponentImplHelper10<
-        ::com::sun::star::ui::dialogs::XFilterManager,
-        ::com::sun::star::ui::dialogs::XFilterGroupManager,
+    public cppu::WeakComponentImplHelper5<
+        ::com::sun::star::ui::dialogs::XFilePicker2,
+        ::com::sun::star::ui::dialogs::XFilePicker3,
         ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-        ::com::sun::star::ui::dialogs::XFilePickerNotifier,
         ::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 >
 {
 public:
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 0fdd42de3529..edb7eaf0af3e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -27,16 +27,11 @@
 #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/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker2.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/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
-#include <com/sun/star/util/XCancellable.hpp>
 
-#include <cppuhelper/compbase10.hxx>
+#include <cppuhelper/compbase5.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ustring.hxx>
 
@@ -48,16 +43,11 @@ namespace vista{
 // types
 //-----------------------------------------------------------------------------
 
-typedef ::cppu::WeakComponentImplHelper10<
+typedef ::cppu::WeakComponentImplHelper5<
                 css::ui::dialogs::XFilePicker2,
-                css::ui::dialogs::XFilterManager,
-                css::ui::dialogs::XFilterGroupManager,
+                css::ui::dialogs::XFilePicker3,
                 css::ui::dialogs::XFilePickerControlAccess,
-                css::ui::dialogs::XFilePickerNotifier,
                 css::ui::dialogs::XFilePreview,
-                css::lang::XInitialization,
-                css::util::XCancellable,
-                css::lang::XEventListener,
                 css::lang::XServiceInfo >   TVistaFilePickerBase;
 
 //-----------------------------------------------------------------------------