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

[Noel Grandin]

 fpicker/source/aqua/SalAquaFilePicker.hxx      |   10 ++++++----
 fpicker/source/aqua/SalAquaFilePicker.mm       |    5 +----
 fpicker/source/win32/filepicker/FilePicker.cxx |    9 +++------
 fpicker/source/win32/filepicker/FilePicker.hxx |   14 ++++++++------
 4 files changed, 18 insertions(+), 20 deletions(-)

New commits:
commit a315af8ef47c2a9c774f3ffd7820091368a9aa5b
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Feb 12 13:33:02 2013 +0200

    use a typedef to reduce code duplication
    
    Change-Id: I915b88ad0683cecaf2018a529fb904753a4f27c0

diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 6d6cbd0..f1e4f23 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -47,12 +47,14 @@
 // class declaration
 //----------------------------------------------------------
 
+typedef ::cppu::WeakComponentImplHelper3 <
+            ::com::sun::star::ui::dialogs::XFilePicker3,
+            ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
+           ::com::sun::star::lang::XServiceInfo >  SalAquaFilePicker_Base;
+
 class SalAquaFilePicker :
     public SalAquaPicker,
-    public cppu::WeakComponentImplHelper3<
-    ::com::sun::star::ui::dialogs::XFilePicker3,
-    ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-    ::com::sun::star::lang::XServiceInfo >
+    public SalAquaFilePicker_Base
 {
 public:
 
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index cb6c2c2..c611ec5 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -93,10 +93,7 @@ namespace
 //-----------------------------------------------------------------------------------------
 
 SalAquaFilePicker::SalAquaFilePicker()
-  : cppu::WeakComponentImplHelper3<
-             XFilePicker3,
-             XFilePickerControlAccess,
-             lang::XServiceInfo>( m_rbHelperMtx )
+  : SalAquaFilePicker_Base( m_rbHelperMtx )
    , m_pFilterHelper( NULL )
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
commit 33d086fee6ad27cd7cfc35fce37f0d9c17fecf33
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Feb 12 13:30:46 2013 +0200

    Fix compilation of MS-Windows FilePicker
    
    ...broken by 4b51374a7021d52f7f1be1861e2ee6a011b30ecd "fdo#46808,
    Adapt ui::dialogs::FilePicker UNO service to new style."
    
    Change-Id: Ie57b08ea16c9f8e350177c050a6d9ff952fd7332

diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 09924f5..acc3fc6 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -67,12 +67,9 @@ namespace
 //-----------------------------------------------------------------------------------------
 
 CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) :
-    cppu::WeakComponentImplHelper3<
-        XFilePicker2,
-        XFilePicker3,
-        lang::XServiceInfo>(m_rbHelperMtx),
-        m_xServiceMgr(xServiceMgr),
-        m_aAsyncEventNotifier(rBHelper)
+    CFilePicker_Base(m_rbHelperMtx),
+    m_xServiceMgr(xServiceMgr),
+    m_aAsyncEventNotifier(rBHelper)
 {
     HINSTANCE hInstance = GetModuleHandle(FILE_PICKER_DLL_NAME);
     OSL_POSTCOND( hInstance, "The name of the service dll must have changed" );
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 059c81f..83b7ecd 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -52,14 +52,16 @@ protected:
     osl::Mutex  m_rbHelperMtx;
 };
 
+typedef ::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::XFilePreview,
+            ::com::sun::star::lang::XServiceInfo >   CFilePicker_Base;
+
 class CFilePicker :
     public CFilePickerDummy,
-    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::XFilePreview,
-        ::com::sun::star::lang::XServiceInfo >
+    public CFilePicker_Base
 {
 public: