summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 12:30:16 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 12:30:16 +0000
commit26fb225577fb2c64c4ad7f9bcc41e223d3d44cae (patch)
tree28faace9209c1113a085b9010d1cc66d5a7e1323
parent36e319ce5fffb3d1eb7f999a060f05e49b3d62b3 (diff)
INTEGRATION: CWS obo05 (1.5.8); FILE MERGED
2006/08/28 13:47:49 obo 1.5.8.1: #i53611# diable warnings C4917 and 4555
-rwxr-xr-xembedserv/source/embed/esdll.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index 978dce1bbb4e..53a80728d53b 100755
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: esdll.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 05:40:26 $
+ * last change: $Author: vg $ $Date: 2006-09-25 13:30:16 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -39,6 +39,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 "stdafx.h"
@@ -86,4 +89,4 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
// warning C4505: 'xxx' : unreferenced local function has been removed
#if defined(_MSC_VER)
#pragma warning(disable: 4505)
-#endif
+#endif \ No newline at end of file