diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-20 12:05:24 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-20 12:05:50 +0100 |
| commit | 82e951c26af28ad58b380a97acaf7aa446714b05 (patch) | |
| tree | cf113dcab7f59260439bfe7d9cf92b6f8e64b9bd | |
| parent | d0cde9640b52ccfbb28ed1f65bba0927afd7b69b (diff) | |
KDE4FilePicker: un-break build
Change-Id: Id41a0f4bc7db04f343a50ff23080a616abbbd6c6
| -rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.hxx | 19 |
2 files changed, 13 insertions, 14 deletions
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 951ea8b944e4..6b3e1a925400 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -105,12 +105,8 @@ QString toQString(const rtl::OUString& s) ////////////////////////////////////////////////////////////////////////// KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) - : cppu::WeakComponentImplHelper4< - XFilePicker2, - XFilePicker3, - XFilePickerControlAccess, - lang::XServiceInfo>( _helperMutex ), - _resMgr( ResMgr::CreateResMgr("fps_office") ) + : KDE4FilePicker_Base(_helperMutex) + , _resMgr( ResMgr::CreateResMgr("fps_office") ) { _extraControls = new QWidget(); _layout = new QGridLayout(_extraControls); diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 7db8e81791ef..1170f96597b8 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -42,14 +42,17 @@ class QLayout; class ResMgr; -class KDE4FilePicker : - public 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 > +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 +> KDE4FilePicker_Base; + +class KDE4FilePicker + : public KDE4FilePicker_Base { protected: |