From ffbfe477b116c82e6b27bf3b39535382359bea99 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 29 May 2017 15:10:49 +0200
Subject: fpicker: remove ifdef __IFileDialogCustomize_INTERFACE_DEFINED__

No idea what SDK problem this once worked around but surely it's
obsolete now.

Change-Id: I5cfa37710ea8cecee8acc9c8f5a6a08fae4babbd
---
 fpicker/source/win32/filepicker/VistaFilePicker.cxx             | 5 -----
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 5 -----
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx | 5 -----
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx         | 5 -----
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx         | 5 -----
 5 files changed, 25 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index ebe19f3b42b8..f0481f5a756b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -23,9 +23,6 @@
 
 #include "VistaFilePicker.hxx"
 
-// Without IFileDialogCustomize we can't do much
-#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
-
 #include "../misc/WinImplHelper.hxx"
 #include "shared.hxx"
 
@@ -531,6 +528,4 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSupportedServiceName
 } // namespace win32
 } // namespace fpicker
 
-#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 6233f0e17693..4817ff129170 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -20,9 +20,6 @@
 
 #include "VistaFilePickerEventHandler.hxx"
 
-// Without IFileDialogCustomize we can't do much
-#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
-
 #include "asyncrequests.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -328,6 +325,4 @@ void VistaFilePickerEventHandler::impl_sendEvent(  EEventType eEventType,
 } // namespace win32
 } // namespace fpicker
 
-#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 103e2667299d..6a8a783dce7d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -26,9 +26,6 @@
 
 #include <shobjidl.h>
 
-// Without IFileDialogCustomize we can't do this
-#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
-
 #include "comptr.hxx"
 #include "vistatypes.h"
 #include "IVistaFilePickerInternalNotify.hxx"
@@ -198,8 +195,6 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
 } // namespace win32
 } // namespace fpicker
 
-#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
-
 #endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 0c8dc884aabf..e7a6697d4fb8 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -19,9 +19,6 @@
 
 #include "VistaFilePickerImpl.hxx"
 
-// 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>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
@@ -1225,6 +1222,4 @@ bool VistaFilePickerImpl::onFileTypeChanged( UINT /*nTypeIndex*/ )
 } // namespace win32
 } // namespace fpicker
 
-#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 ee3b7f4d856c..b7ea4de5fc0e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -34,9 +34,6 @@
 #pragma warning(pop)
 #endif
 
-// Without IFileDialogCustomize we can't do this
-#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
-
 #include "asyncrequests.hxx"
 #include "comptr.hxx"
 #include "vistatypes.h"
@@ -328,8 +325,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
 } // namespace win32
 } // namespace fpicker
 
-#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
-
 #endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit