summaryrefslogtreecommitdiff
path: root/embedserv/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 12:31:32 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 12:31:32 +0000
commit01b8752dbc1dab29015fc8b5a995a0db40079f83 (patch)
tree7b2f0c9c6d4bdc7190fae5bfe8b1bfbae40a6dda /embedserv/source
parent8e2d67d6db5a9d5dcf7ed1be2606ee426022363c (diff)
INTEGRATION: CWS obo05 (1.4.10); FILE MERGED
2006/08/28 13:47:50 obo 1.4.10.1: #i53611# diable warnings C4917 and 4555
Diffstat (limited to 'embedserv/source')
-rw-r--r--embedserv/source/embed/syswinwrapper.cxx7
-rw-r--r--embedserv/source/embed/tracker.cxx7
2 files changed, 10 insertions, 4 deletions
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index f40dd8323483..0c78c2e0214c 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: syswinwrapper.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 05:41:53 $
+ * last change: $Author: vg $ $Date: 2006-09-25 13:31:15 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -32,6 +32,9 @@
* MA 02111-1307 USA
*
************************************************************************/
+#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#pragma warning(disable : 4917 4555)
+#endif
#include "docholder.hxx"
#include "syswinwrapper.hxx"
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index d8e831c727c8..4540a1554ae7 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: tracker.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 05:42:11 $
+ * last change: $Author: vg $ $Date: 2006-09-25 13:31:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -32,6 +32,9 @@
* MA 02111-1307 USA
*
************************************************************************/
+#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#pragma warning(disable : 4917 4555)
+#endif
#include "stdafx.h"
#include <stddef.h>