From 33d086fee6ad27cd7cfc35fce37f0d9c17fecf33 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 12 Feb 2013 13:30:46 +0200 Subject: Fix compilation of MS-Windows FilePicker ...broken by 4b51374a7021d52f7f1be1861e2ee6a011b30ecd "fdo#46808, Adapt ui::dialogs::FilePicker UNO service to new style." Change-Id: Ie57b08ea16c9f8e350177c050a6d9ff952fd7332 --- fpicker/source/win32/filepicker/FilePicker.cxx | 9 +++------ fpicker/source/win32/filepicker/FilePicker.hxx | 14 ++++++++------ 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'fpicker') 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& 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: -- cgit ro/collabora/co-23.05'>distro/collabora/co-23.05 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-10-09 12:22:23 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-11-06 11:58:16 +0000
commit44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70 (patch)
treecfca2fb5cd4676d7d55648fe11105753c2178d5d /ucb/source
parenteff92f2501cf070cd912508b2ccc3c0108d0327c (diff)
re-base on ALv2 code. Includes (at least) relevant parts of: