diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-12 13:30:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-12 13:30:46 +0200 |
| commit | 33d086fee6ad27cd7cfc35fce37f0d9c17fecf33 (patch) | |
| tree | bd0aed1995f5a61ab4392209ccf11d72fd2d83db | |
| parent | a1609205604f74440c046166b09ee96f088e437b (diff) | |
Fix compilation of MS-Windows FilePicker
...broken by 4b51374a7021d52f7f1be1861e2ee6a011b30ecd "fdo#46808,
Adapt ui::dialogs::FilePicker UNO service to new style."
Change-Id: Ie57b08ea16c9f8e350177c050a6d9ff952fd7332
| -rw-r--r-- | fpicker/source/win32/filepicker/FilePicker.cxx | 9 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/FilePicker.hxx | 14 |
2 files changed, 11 insertions, 12 deletions
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 09924f567c84..acc3fc677949 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -67,12 +67,9 @@ namespace //----------------------------------------------------------------------------------------- CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) : - cppu::WeakComponentImplHelper3< - XFilePicker2, - XFilePicker3, - lang::XServiceInfo>(m_rbHelperMtx), - m_xServiceMgr(xServiceMgr), - m_aAsyncEventNotifier(rBHelper) + CFilePicker_Base(m_rbHelperMtx), + m_xServiceMgr(xServiceMgr), + m_aAsyncEventNotifier(rBHelper) { HINSTANCE hInstance = GetModuleHandle(FILE_PICKER_DLL_NAME); OSL_POSTCOND( hInstance, "The name of the service dll must have changed" ); diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx index 059c81f273ad..83b7ecdf346c 100644 --- a/fpicker/source/win32/filepicker/FilePicker.hxx +++ b/fpicker/source/win32/filepicker/FilePicker.hxx @@ -52,14 +52,16 @@ protected: osl::Mutex m_rbHelperMtx; }; +typedef ::cppu::WeakComponentImplHelper5 < + ::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::XServiceInfo > CFilePicker_Base; + class CFilePicker : public CFilePickerDummy, - public cppu::WeakComponentImplHelper5< - ::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::XServiceInfo > + public CFilePicker_Base { public: |