summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2012-02-24 18:36:20 +0100
committerJan Holesovsky <kendy@suse.cz>2012-02-24 18:54:37 +0100
commit330c38edfb2ba1c794166c0d885074b248198da2 (patch)
tree4a9746286c95a2c94bc8fd3a06d8e5b6f1a1db7a
parent6cd8586f2332f2d8a87221452719c33ee0bb9d06 (diff)
MinGW: IFileDialog is present, but IFileDialogCustomize is still missing.
-rw-r--r--fpicker/source/win32/filepicker/FPentry.cxx2
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx6
6 files changed, 16 insertions, 16 deletions
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index c45b69e0258c..8213a57c2158 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -65,7 +65,7 @@ static Reference< XInterface > SAL_CALL createInstance(
{
Reference< XInterface > xDlg;
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
bool bVistaOrNewer = IsWindowsVistaOrNewer();
if (bVistaOrNewer)
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 9607963140b9..144be502cd96 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -37,8 +37,8 @@
#include "VistaFilePicker.hxx"
-// Without IFileDialog we can't do much
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do much
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include "WinFileOpenImpl.hxx"
#include "../misc/WinImplHelper.hxx"
@@ -717,6 +717,6 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSupportedServ
} // namespace win32
} // namespace fpicker
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index a008e1a172d2..48f349a6466e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -29,8 +29,8 @@
#include "VistaFilePickerEventHandler.hxx"
-// Without IFileDialog we can't do much
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do much
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include "asyncrequests.hxx"
@@ -463,6 +463,6 @@ void VistaFilePickerEventHandler::impl_sendEvent( EEventType eEventType,
} // namespace win32
} // namespace fpicker
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index d86755fa5a9a..76e680500cb5 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -39,8 +39,8 @@
#include <shobjidl.h>
-// Without IFileDialog we can't do this
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do this
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include "comptr.hxx"
#include "vistatypes.h"
@@ -226,7 +226,7 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
#undef css
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
#endif // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 2777662c7d3a..b7337ab92484 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -32,8 +32,8 @@
#include "VistaFilePickerImpl.hxx"
-// Without IFileDialog we can't do much
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do much
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
@@ -1269,6 +1269,6 @@ bool VistaFilePickerImpl::onFileTypeChanged( UINT /*nTypeIndex*/ )
} // namespace win32
} // namespace fpicker
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 174881a509f5..a8a07a2349ff 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -47,8 +47,8 @@
#pragma warning(pop)
#endif
-// Without IFileDialog we can't do this
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do this
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
#include "asyncrequests.hxx"
#include "comptr.hxx"
@@ -365,7 +365,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
#undef css
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
#endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX