summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-07-20 22:45:52 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-07-20 22:45:52 +0300
commitb0cd0b114548383b5451933e94742d5de7b878bd (patch)
treeceff7daf63f3aa5bee06c7a588f80d23d94b180e /fpicker
parent104587b4ee67fca94123650022d1cbab9b298002 (diff)
Fix MSVC warnings and errors, fallout from previous commit
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx9
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx3
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx3
4 files changed, 8 insertions, 11 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 06cfb5e35194..2a1072af64e6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/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"
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index b12c2f1204d2..b05b5d52e36d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/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>
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 4795e379fda6..0e0a3ff8e322 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/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>
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index ad54c25fd7e6..78e7ecdf6c8b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/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"