[Libreoffice-commits] core.git: vcl/unx

[Noel Grandin]

 vcl/unx/kde/UnxFilePicker.cxx |    8 +-------
 vcl/unx/kde/UnxFilePicker.hxx |   10 ++++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit f3ceb0be8805657a3b886509ac255128a11b5974
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Feb 20 13:43:03 2013 +0200

    fixup class vs. constructor definition
    
    Change-Id: Idab639141a989bc9752df67b083a5d6e1e01ac37

diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 0145d4c..2bd096a 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -87,13 +87,7 @@ namespace
 //////////////////////////////////////////////////////////////////////////
 
 UnxFilePicker::UnxFilePicker( const uno::Reference<uno::XComponentContext>& )
-    : cppu::WeakComponentImplHelper5<
-// TODO   XFilePreview,
-          XFilePicker2,
-          XFilePicker3,
-          XFilePickerControlAccess,
-          lang::XInitialization,
-          lang::XServiceInfo>( m_rbHelperMtx ),
+    : UnxFilePicker_Base( m_rbHelperMtx ),
           m_nFilePickerPid( -1 ),
           m_nFilePickerWrite( -1 ),
           m_nFilePickerRead( -1 ),
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 37ba21c..afc5b6c 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -45,15 +45,17 @@ protected:
     osl::Mutex                  m_rbHelperMtx;
 };
 
-class UnxFilePicker :
-    public UnxFilePickerDummy,
-    public cppu::WeakComponentImplHelper5<
+typedef ::cppu::WeakComponentImplHelper5<
         ::com::sun::star::ui::dialogs::XFilePicker2,
         ::com::sun::star::ui::dialogs::XFilePicker3,
         ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
 // TODO ::com::sun::star::ui::dialogs::XFilePreview,
         ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::lang::XServiceInfo >
+        ::com::sun::star::lang::XServiceInfo >  UnxFilePicker_Base;
+
+class UnxFilePicker :
+    public UnxFilePickerDummy,
+    public UnxFilePicker_Base
 {
 protected: