diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:13:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:13:32 +0000 |
| commit | 1aa5f11c43bf38fca38a7b90bdda2d0b52a47bcc (patch) | |
| tree | 49e4071dd8fce741065a77159b9c0a95a158c32a /shell | |
| parent | 455c8485b4e1d0e73f1f1e55f0d7421c50b75fbd (diff) | |
INTEGRATION: CWS warnings01 (1.4.14); FILE MERGED
2006/03/10 15:10:55 pl 1.4.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/inc/internal/config.hxx | 6 | ||||
| -rw-r--r-- | shell/inc/internal/propsheets.hxx | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx index 9146e6e73815..4a7dadcfa21c 100644 --- a/shell/inc/internal/config.hxx +++ b/shell/inc/internal/config.hxx @@ -4,9 +4,9 @@ * * $RCSfile: config.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:35:31 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:12:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,7 @@ #ifndef CONFIG_HXX_INCLUDED #define CONFIG_HXX_INCLUDED -#pragma warning (disable : 4786 4503) +#pragma warning (disable : 4786 4503 4917) #include <tchar.h> diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx index 91dca2832088..d2f5c51bd78a 100644 --- a/shell/inc/internal/propsheets.hxx +++ b/shell/inc/internal/propsheets.hxx @@ -4,9 +4,9 @@ * * $RCSfile: propsheets.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:38:17 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:13:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,7 +40,13 @@ #include "internal/metainforeader.hxx" #endif +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <shlobj.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif #include <string> #include <memory> |