diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 06:31:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 06:31:25 +0000 |
| commit | 48ac148611f2c78ec19c3791559013f12ae681a9 (patch) | |
| tree | 74145e3cb9fd92b998e2bd461feb60434c9e80fb /fpicker | |
| parent | dd0a38f5a9bc9f4fc9ee42633e0841d845433af7 (diff) | |
INTEGRATION: CWS hro34 (1.9.144); FILE MERGED
2008/03/07 10:38:14 hro 1.9.144.1: #i78851# #i72556# Implemented Vista style File Dialog
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/FileOpenDlg.hxx | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx index 9ee4491d9744..d26de28fef2c 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx @@ -4,9 +4,9 @@ * * $RCSfile: FileOpenDlg.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-10-12 10:48:22 $ + * last change: $Author: rt $ $Date: 2008-03-12 07:31:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,13 +52,7 @@ #include <rtl/ustrbuf.hxx> #endif -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -#include <windows.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif +#include "platform_xp.h" #ifndef _GETFILENAMEWRAPPER_HXX_ #include "getfilenamewrapper.hxx" @@ -141,13 +135,15 @@ typedef _LPOPENFILENAMEA _LPOPENFILENAME; #endif // UNICODE #if (_WIN32_WINNT >= 0x0500) -#define _OPENFILENAME_SIZE_VERSION_400A _CDSIZEOF_STRUCT(_OPENFILENAMEA,lpTemplateName) -#define _OPENFILENAME_SIZE_VERSION_400W _CDSIZEOF_STRUCT(_OPENFILENAMEW,lpTemplateName) -#ifdef UNICODE -#define _OPENFILENAME_SIZE_VERSION_400 _OPENFILENAME_SIZE_VERSION_400W + #define _OPENFILENAME_SIZE_VERSION_400A _CDSIZEOF_STRUCT(_OPENFILENAMEA,lpTemplateName) + #define _OPENFILENAME_SIZE_VERSION_400W _CDSIZEOF_STRUCT(_OPENFILENAMEW,lpTemplateName) + #ifdef UNICODE + #define _OPENFILENAME_SIZE_VERSION_400 _OPENFILENAME_SIZE_VERSION_400W + #else + #define _OPENFILENAME_SIZE_VERSION_400 _OPENFILENAME_SIZE_VERSION_400A + #endif // !UNICODE #else -#define _OPENFILENAME_SIZE_VERSION_400 _OPENFILENAME_SIZE_VERSION_400A -#endif // !UNICODE + #error _WIN32_WINNT seams not to be valid. #endif // (_WIN32_WINNT >= 0x0500) |