summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fpicker/source/aqua/FPentry.mm3
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.hxx5
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.mm6
3 files changed, 5 insertions, 9 deletions
diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index 7f9a3e1ca288..98be8b05d9ee 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 fbf7ac7b70f8..6d6cbd00755d 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 66355485bd41..cb6c2c2beaba 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__);