summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-11-13 14:20:18 +0000
committerRüdiger Timm <rt@openoffice.org>2007-11-13 14:20:18 +0000
commitc89120c13bc8800fef462f822d350010bdf453ed (patch)
tree031e339668a434875ff0f0db495d197f66c38ead /embeddedobj
parent07bf967ae9d03bd375a698e9cdfc51751eb810d0 (diff)
INTEGRATION: CWS sb82 (1.5.24); FILE MERGED
2007/11/07 12:40:00 sb 1.5.24.1: #i83412# Disable warnings in system headers (wntmsci11).
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/msole/platform.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index 7a4c88227899..5e0b22433b75 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -4,9 +4,9 @@
*
* $RCSfile: platform.h,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: vg $ $Date: 2007-03-26 13:44:08 $
+ * last change: $Author: rt $ $Date: 2007-11-13 15:20:18 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -44,7 +44,7 @@
#if defined _MSC_VER
#pragma warning(push, 1)
-#pragma warning(disable: 4548 4917)
+#pragma warning(disable: 4548 4555 4917)
#endif
#include "windows.h"
#ifdef __MINGW32__