diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-20 22:45:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-20 22:45:52 +0300 |
| commit | aeb2568a5577e4b19d49dadf90d7de5865e50b73 (patch) | |
| tree | 34c1e54417303c39cf3de047ddae1eb41e50f8e6 | |
| parent | 40fa812f8acee8cb0e5ddd5ac425e36b7bbffbd1 (diff) | |
Fix MSVC warnings and errors, fallout from previous commit
4 files changed, 8 insertions, 11 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 84624e7a1b..eb42f39a8b 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 1be74ca0d6..f673f23146 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 5afbbf3407..8f8a346433 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 ed8e973fad..5c3fdd42db 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" |