[Libreoffice-commits] core.git: fpicker/source

[Noel Grandin]

 fpicker/source/aqua/FPentry.mm            |    3 +--
 fpicker/source/aqua/SalAquaFilePicker.hxx |    5 +----
 fpicker/source/aqua/SalAquaFilePicker.mm  |    6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit a1609205604f74440c046166b09ee96f088e437b
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Feb 12 11:44:43 2013 +0200

    Fix compilation of MacOS FilePicker
    
    ...broken by 4b51374a7021d52f7f1be1861e2ee6a011b30ecd "fdo#46808,
    Adapt ui::dialogs::FilePicker UNO service to new style."
    
    Also remove unused field while we're there.
    
    Change-Id: If7e2057b9383edf4ee2fa581df984dea0e04e430

diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index 7f9a3e1..98be8b0 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/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(
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index fbf7ac7..6d6cbd0 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/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;
 
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 6635548..cb6c2c2 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/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__);