diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:32:00 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:32:00 +0000 |
| commit | 76487608453a6272bcf32116174dde6026bb48f5 (patch) | |
| tree | 9b08ddc5d44116dd2be7838c6ffa46421a507bfd | |
| parent | 913c3bfa081a2db09bbe0df3bcb0e65cbe38f237 (diff) | |
INTEGRATION: CWS obo05 (1.2.16); FILE MERGED
2006/08/28 13:48:34 obo 1.2.16.1: #i53611# diable warnings C4917 and 4555
| -rw-r--r-- | embedserv/source/inc/embeddocaccess.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx index 3af201d130e6..95784bd8b21b 100644 --- a/embedserv/source/inc/embeddocaccess.hxx +++ b/embedserv/source/inc/embeddocaccess.hxx @@ -4,9 +4,9 @@ * * $RCSfile: embeddocaccess.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2006-05-05 09:56:51 $ + * last change: $Author: vg $ $Date: 2006-09-25 13:32:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,8 +41,12 @@ #endif #include <oleidl.h> +#if defined(_MSC_VER) && (_MSC_VER > 1310) +#pragma warning(disable : 4265) +#include <atldbcli.h> +#else #include <atlcomcli.h> - +#endif #include <cppuhelper/weak.hxx> class EmbedDocument_Impl; @@ -67,4 +71,3 @@ class EmbeddedDocumentInstanceAccess_Impl : public ::cppu::OWeakObject }; #endif - |