diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-15 07:58:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-15 08:01:40 +0200 |
| commit | 3164966103b7d5c19197b7e94040d585e5af04ac (patch) | |
| tree | 5281cb60da8591ddfea0168753d6cb838ae59375 /vcl | |
| parent | d2668a9118a20c62e28cf064c5c625f096a9c20d (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 11 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 21 |
2 files changed, 9 insertions, 23 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 386395b3bbe8..0527a827156d 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 a19c4bac35c6..c9fbb9ab8fc9 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: |