mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation of MS-Windows FilePicker

Browse Source 
...broken by 4b51374a70 "fdo#46808,
Adapt ui::dialogs::FilePicker UNO service to new style."

Change-Id: Ie57b08ea16c9f8e350177c050a6d9ff952fd7332
This commit is contained in:
Noel Grandin
2013-02-12 13:30:46 +02:00
parent a160920560
commit 33d086fee6
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fpicker/source/win32/filepicker/FilePicker.cxx
View File

@@ -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" );

14
fpicker/source/win32/filepicker/FilePicker.hxx
View File

@@ -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: