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

[Noel Grandin]

 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |   11 +----------
 vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx |   21 ++++++++-------------
 2 files changed, 9 insertions(+), 23 deletions(-)

New commits:
commit 3164966103b7d5c19197b7e94040d585e5af04ac
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Feb 15 07:58:04 2013 +0200

    fix fdo#60804 - Print to File leads to Crash
    
    This was because of my busted commit in
    4b51374a7021d52f7f1be1861e2ee6a011b30ecd
    "fdo#46808, Adapt ui::dialogs::FilePicker UNO service to new style"
    
    Change-Id: Iaf99dcf052b5aac7f995b86a0e8af9725839802d

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 386395b..0527a82 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -90,16 +90,7 @@ void SalGtkFilePicker::InitialMapping()
 
 SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext >& xContext ) :
     SalGtkPicker( xContext ),
-    cppu::WeakComponentImplHelper9<
-        XFilterManager,
-        XFilterGroupManager,
-        XFilePickerControlAccess,
-        XFilePickerNotifier,
-        XFilePreview,
-        XFilePicker2,
-        lang::XInitialization,
-        util::XCancellable,
-        lang::XEventListener>( m_rbHelperMtx ),
+    SalGtkFilePicker_Base( m_rbHelperMtx ),
     m_pFilterList( NULL ),
     m_pVBox ( NULL ),
     mnHID_FolderChange( 0 ),
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index a19c4ba..c9fbb9a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -20,13 +20,11 @@
 #ifndef _SALGTKFILEPICKER_HXX_
 #define _SALGTKFILEPICKER_HXX_
 
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase5.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilePreview.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
 
 #include <list>
@@ -54,18 +52,15 @@ typedef ::com::sun::star::uno::Sequence< UnoFilterEntry >   UnoFilterList;  // c
 // class declaration
 //----------------------------------------------------------
 
-class SalGtkFilePicker :
-        public SalGtkPicker,
-    public cppu::WeakComponentImplHelper9<
-        ::com::sun::star::ui::dialogs::XFilterManager,
-        ::com::sun::star::ui::dialogs::XFilterGroupManager,
+typedef cppu::WeakComponentImplHelper5<
         ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-        ::com::sun::star::ui::dialogs::XFilePickerNotifier,
         ::com::sun::star::ui::dialogs::XFilePreview,
         ::com::sun::star::ui::dialogs::XFilePicker2,
-        ::com::sun::star::lang::XInitialization,
-        ::com::sun::star::util::XCancellable,
-        ::com::sun::star::lang::XEventListener >
+        ::com::sun::star::ui::dialogs::XFilePicker3,
+        ::com::sun::star::lang::XInitialization
+        > SalGtkFilePicker_Base;
+
+class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
 {
     public: