diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:09:05 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:09:05 +0000 |
| commit | 8e9c0ba1d3d2196e95c33a569460445a08d4c770 (patch) | |
| tree | 68ecab5cbf1f20977a333ba56e073d0b4d840560 /embeddedobj/source | |
| parent | b581120b6ac6f2b8ccbed9305858e7d9c253841f (diff) | |
INTEGRATION: CWS sb59 (1.2.64); FILE MERGED
2006/09/29 13:47:31 sb 1.2.64.2: Manually merged in 1.3 (from SRC680m186).
2006/08/29 14:08:21 sb 1.2.64.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'embeddedobj/source')
| -rw-r--r-- | embeddedobj/source/msole/platform.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h index d7abcd1ed9db..03c799cf1b51 100644 --- a/embeddedobj/source/msole/platform.h +++ b/embeddedobj/source/msole/platform.h @@ -4,9 +4,9 @@ * * $RCSfile: platform.h,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2006-09-25 13:02:05 $ + * last change: $Author: obo $ $Date: 2006-10-12 14:09:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,12 +42,19 @@ #endif #define _ATL_APARTMENT_THREADED +#if defined _MSC_VER +#pragma warning(push, 1) +#pragma warning(disable: 4548 4917) +#endif #include "windows.h" #if defined(_MSC_VER) && (_MSC_VER > 1310) #include <atldbcli.h> #else #include "atlcomcli.h" #endif +#if defined _MSC_VER +#pragma warning(pop) +#endif #endif |