Fix MSVC warnings and errors, fallout from previous commit

fpicker/source/win32/filepicker/VistaFilePicker.cxx

@@ -33,16 +33,15 @@
 // includes
 //------------------------------------------------------------------------
 
-#include <shobjidl.h>
-
-// Without IFileDialog we can't do much
-#ifdef __IFileDialog_INTERFACE_DEFINED__
-
 #ifdef _MSC_VER
 #pragma warning (disable:4917)
 #endif
 
 #include "VistaFilePicker.hxx"
+
+// Without IFileDialog we can't do much
+#ifdef __IFileDialog_INTERFACE_DEFINED__
+
 #include "WinFileOpenImpl.hxx"
 #include "../misc/WinImplHelper.hxx"
 #include "shared.hxx"

fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx

@@ -29,12 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_fpicker.hxx"
 
-#include <shobjidl.h>
+#include "VistaFilePickerEventHandler.hxx"
 
 // Without IFileDialog we can't do much
 #ifdef __IFileDialog_INTERFACE_DEFINED__
 
-#include "VistaFilePickerEventHandler.hxx"
 #include "asyncrequests.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx

@@ -30,13 +30,11 @@
 // includes
 //-----------------------------------------------------------------------------
 
-#include <shobjidl.h>
+#include "VistaFilePickerImpl.hxx"
 
 // Without IFileDialog we can't do much
 #ifdef __IFileDialog_INTERFACE_DEFINED__
 
-#include "VistaFilePickerImpl.hxx"
-
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>

fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx

@@ -37,6 +37,8 @@
 #pragma warning( disable : 4917 )
 #endif
 
+#include "platform_vista.h"
+
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
@@ -48,7 +50,6 @@
 // Without IFileDialog we can't do this
 #ifdef __IFileDialog_INTERFACE_DEFINED__
 
-#include "platform_vista.h"
 #include "asyncrequests.hxx"
 #include "comptr.hxx"
 #include "vistatypes.h"