Kaydet (Commit) 330c38ed authored tarafından Jan Holesovsky's avatar Jan Holesovsky

MinGW: IFileDialog is present, but IFileDialogCustomize is still missing.

üst 6cd8586f
...@@ -65,7 +65,7 @@ static Reference< XInterface > SAL_CALL createInstance( ...@@ -65,7 +65,7 @@ static Reference< XInterface > SAL_CALL createInstance(
{ {
Reference< XInterface > xDlg; Reference< XInterface > xDlg;
#ifdef __IFileDialog_INTERFACE_DEFINED__ #ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
bool bVistaOrNewer = IsWindowsVistaOrNewer(); bool bVistaOrNewer = IsWindowsVistaOrNewer();
if (bVistaOrNewer) if (bVistaOrNewer)
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include "VistaFilePicker.hxx" #include "VistaFilePicker.hxx"
// Without IFileDialog we can't do much // Without IFileDialogCustomize we can't do much
#ifdef __IFileDialog_INTERFACE_DEFINED__ #ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include "WinFileOpenImpl.hxx" #include "WinFileOpenImpl.hxx"
#include "../misc/WinImplHelper.hxx" #include "../misc/WinImplHelper.hxx"
...@@ -717,6 +717,6 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSupportedServ ...@@ -717,6 +717,6 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSupportedServ
} // namespace win32 } // namespace win32
} // namespace fpicker } // namespace fpicker
#endif // __IFileDialog_INTERFACE_DEFINED__ #endif // __IFileDialogCustomize_INTERFACE_DEFINED__
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "VistaFilePickerEventHandler.hxx" #include "VistaFilePickerEventHandler.hxx"
// Without IFileDialog we can't do much // Without IFileDialogCustomize we can't do much
#ifdef __IFileDialog_INTERFACE_DEFINED__ #ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include "asyncrequests.hxx" #include "asyncrequests.hxx"
...@@ -463,6 +463,6 @@ void VistaFilePickerEventHandler::impl_sendEvent( EEventType eEventType, ...@@ -463,6 +463,6 @@ void VistaFilePickerEventHandler::impl_sendEvent( EEventType eEventType,
} // namespace win32 } // namespace win32
} // namespace fpicker } // namespace fpicker
#endif // __IFileDialog_INTERFACE_DEFINED__ #endif // __IFileDialogCustomize_INTERFACE_DEFINED__
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include <shobjidl.h> #include <shobjidl.h>
// Without IFileDialog we can't do this // Without IFileDialogCustomize we can't do this
#ifdef __IFileDialog_INTERFACE_DEFINED__ #ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include "comptr.hxx" #include "comptr.hxx"
#include "vistatypes.h" #include "vistatypes.h"
...@@ -226,7 +226,7 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex ...@@ -226,7 +226,7 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
#undef css #undef css
#endif // __IFileDialog_INTERFACE_DEFINED__ #endif // __IFileDialogCustomize_INTERFACE_DEFINED__
#endif // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX #endif // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
#include "VistaFilePickerImpl.hxx" #include "VistaFilePickerImpl.hxx"
// Without IFileDialog we can't do much // Without IFileDialogCustomize we can't do much
#ifdef __IFileDialog_INTERFACE_DEFINED__ #ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ControlActions.hpp> #include <com/sun/star/ui/dialogs/ControlActions.hpp>
...@@ -1269,6 +1269,6 @@ bool VistaFilePickerImpl::onFileTypeChanged( UINT /*nTypeIndex*/ ) ...@@ -1269,6 +1269,6 @@ bool VistaFilePickerImpl::onFileTypeChanged( UINT /*nTypeIndex*/ )
} // namespace win32 } // namespace win32
} // namespace fpicker } // namespace fpicker
#endif // __IFileDialog_INTERFACE_DEFINED__ #endif // __IFileDialogCustomize_INTERFACE_DEFINED__
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
#pragma warning(pop) #pragma warning(pop)
#endif #endif
// Without IFileDialog we can't do this // Without IFileDialogCustomize we can't do this
#ifdef __IFileDialog_INTERFACE_DEFINED__ #ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include "asyncrequests.hxx" #include "asyncrequests.hxx"
#include "comptr.hxx" #include "comptr.hxx"
...@@ -365,7 +365,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex ...@@ -365,7 +365,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
#undef css #undef css
#endif // __IFileDialog_INTERFACE_DEFINED__ #endif // __IFileDialogCustomize_INTERFACE_DEFINED__
#endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX #endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment