Fix compilation of MacOS FilePicker

...broken by 4b51374a "fdo#46808,
Adapt ui::dialogs::FilePicker UNO service to new style."

Also remove unused field while we're there.

Change-Id: If7e2057b9383edf4ee2fa581df984dea0e04e430

fpicker/source/aqua/FPentry.mm

@@ -38,8 +38,7 @@ using ::com::sun::star::ui::dialogs::XFilePicker;
 static Reference< XInterface > SAL_CALL createFileInstance(
     const Reference< XMultiServiceFactory >& rServiceManager )
 {
-    return Reference< XInterface >(
-        *new SalAquaFilePicker( rServiceManager ) );
+    return Reference< XInterface >( *new SalAquaFilePicker );
 }
 
 static Reference< XInterface > SAL_CALL createFolderInstance(

fpicker/source/aqua/SalAquaFilePicker.hxx

@@ -57,7 +57,7 @@ class SalAquaFilePicker :
 public:
 
     // constructor
-    SalAquaFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr );
+    SalAquaFilePicker();
 
     //------------------------------------------------------------------------------------
     // XFilePickerNotifier
@@ -197,9 +197,6 @@ private:
 
     virtual void ensureFilterHelper();
 
-    // to instantiate own services
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
-
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >
     m_xListener;
 

fpicker/source/aqua/SalAquaFilePicker.mm

@@ -92,11 +92,11 @@ namespace
 // constructor
 //-----------------------------------------------------------------------------------------
 
-SalAquaFilePicker::SalAquaFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr )
-  : cppu::WeakComponentImplHelper2<
+SalAquaFilePicker::SalAquaFilePicker()
+  : cppu::WeakComponentImplHelper3<
              XFilePicker3,
+             XFilePickerControlAccess,
              lang::XServiceInfo>( m_rbHelperMtx )
-   , m_xServiceMgr( xServiceMgr )
    , m_pFilterHelper( NULL )
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);