diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-19 10:34:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-19 10:35:44 +0200 |
| commit | 503ee06fb843ac4ace017fde1b8a10c3c0501bc6 (patch) | |
| tree | 7c760a03a9664088eb36aea97fa63684bc5219fe /fpicker | |
| parent | a00f11b97b9fca70e6ed50fdc82ac731f4c47c90 (diff) | |
fix up some of my fdo#46808 changes
... It turns out removing XInitialisation was a bad idea.
Change-Id: I6a08f3f769ffc9017e94e8463a97cb18d39aa677
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.hxx | 5 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/FilePicker.hxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index f1e4f232ffa8..d38a0a2a399a 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -20,7 +20,7 @@ #ifndef _SALAQUAFILEPICKER_HXX_ #define _SALAQUAFILEPICKER_HXX_ -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase4.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> @@ -47,9 +47,10 @@ // class declaration //---------------------------------------------------------- -typedef ::cppu::WeakComponentImplHelper3 < +typedef ::cppu::WeakComponentImplHelper4 < ::com::sun::star::ui::dialogs::XFilePicker3, ::com::sun::star::ui::dialogs::XFilePickerControlAccess, + ::com::sun::star::lang::XInitialization, ::com::sun::star::lang::XServiceInfo > SalAquaFilePicker_Base; class SalAquaFilePicker : diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx index 83b7ecdf346c..73bc3d5a53d1 100644 --- a/fpicker/source/win32/filepicker/FilePicker.hxx +++ b/fpicker/source/win32/filepicker/FilePicker.hxx @@ -20,7 +20,7 @@ #ifndef _FILEPICKER_HXX_ #define _FILEPICKER_HXX_ -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase6.hxx> #include <osl/mutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> @@ -52,11 +52,12 @@ protected: osl::Mutex m_rbHelperMtx; }; -typedef ::cppu::WeakComponentImplHelper5 < +typedef ::cppu::WeakComponentImplHelper6 < ::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::XInitialization, ::com::sun::star::lang::XServiceInfo > CFilePicker_Base; class CFilePicker : |