summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 12:31:46 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 12:31:46 +0000
commit913c3bfa081a2db09bbe0df3bcb0e65cbe38f237 (patch)
treedd99a818d234b0eb5bb73e3696db0f69b6cdfc06
parent01b8752dbc1dab29015fc8b5a995a0db40079f83 (diff)
INTEGRATION: CWS obo05 (1.14.10); FILE MERGED
2006/08/28 13:48:34 obo 1.14.10.1: #i53611# diable warnings C4917 and 4555
-rwxr-xr-xembedserv/source/inc/embeddoc.hxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 91e90a8a548e..81cd9dcceea7 100755
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: embeddoc.hxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 05:42:22 $
+ * last change: $Author: vg $ $Date: 2006-09-25 13:31:46 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -38,6 +38,9 @@
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
#undef _DEBUG
#endif
+#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#pragma warning(disable : 4917 4555)
+#endif
#include "common.h"
#include <oleidl.h>
@@ -187,4 +190,3 @@ protected:
};
#endif //_EMBEDDOC_HXX_
-