[Libreoffice-commits] .: fpicker/source
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Jul 20 12:48:10 PDT 2011
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 9 ++++-----
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 3 +--
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 4 +---
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx | 3 ++-
4 files changed, 8 insertions(+), 11 deletions(-)
New commits:
commit aeb2568a5577e4b19d49dadf90d7de5865e50b73
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Jul 20 22:45:52 2011 +0300
Fix MSVC warnings and errors, fallout from previous commit
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 84624e7..eb42f39 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 1be74ca..f673f23 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 5afbbf3..8f8a346 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 ed8e973..5c3fdd4 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"
More information about the Libreoffice-commits
mailing list