diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:13:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:13:20 +0000 |
| commit | 0f1d6241c3a87237ed24fe0856d3ce7b92579a0c (patch) | |
| tree | 9cc92cb0eba16da14190a773de8472d2eb8d6b60 /shell/inc | |
| parent | 446f8bc60586ff67e1774050318ee3f9e19c08bf (diff) | |
INTEGRATION: CWS warnings01 (1.3.14); FILE MERGED
2006/03/10 15:10:55 pl 1.3.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell/inc')
| -rw-r--r-- | shell/inc/internal/columninfo.hxx | 11 | ||||
| -rw-r--r-- | shell/inc/internal/global.hxx | 10 | ||||
| -rw-r--r-- | shell/inc/internal/infotips.hxx | 11 |
3 files changed, 26 insertions, 6 deletions
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx index 0d07ffaf62..cd73da1eb1 100644 --- a/shell/inc/internal/columninfo.hxx +++ b/shell/inc/internal/columninfo.hxx @@ -4,9 +4,9 @@ * * $RCSfile: columninfo.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:35:11 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:12:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,14 @@ #ifndef COLUMNINFO_HXX_INCLUDED #define COLUMNINFO_HXX_INCLUDED +#if defined _MSC_VER +#pragma warning(push, 1) +#pragma warning(disable:4917) +#endif #include <shlobj.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif class CColumnInfo : public IColumnProvider diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx index 8a54a9a919..8e12c528d0 100644 --- a/shell/inc/internal/global.hxx +++ b/shell/inc/internal/global.hxx @@ -4,9 +4,9 @@ * * $RCSfile: global.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:36:33 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:13:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,13 @@ #ifndef GLOBAL_HXX_INCLUDED #define GLOBAL_HXX_INCLUDED +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif #ifndef DBGMACROS_HXX_INCLUDED #include "internal/dbgmacros.hxx" diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx index fe0b893063..5e01509d1c 100644 --- a/shell/inc/internal/infotips.hxx +++ b/shell/inc/internal/infotips.hxx @@ -4,9 +4,9 @@ * * $RCSfile: infotips.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:37:10 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:13:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,8 +36,15 @@ #ifndef INFOTIPS_HXX_INCLUDED #define INFOTIPS_HXX_INCLUDED +#if defined _MSC_VER +#pragma warning(push, 1) +#pragma warning(disable:4917) +#endif #include <objidl.h> #include <shlobj.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif #include <string> class CInfoTip : public IQueryInfo, public IPersistFile |