summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-01-14 13:36:47 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-01-14 13:36:47 +0000
commit63cd67f50c911d80068ad56374957d9e6e669e9c (patch)
tree37208d4c9eb5f2b757ff37f6720b479d218df339
parentea7e33b82bfca93c7879495e7740f529f0261cbe (diff)
INTEGRATION: CWS wae4extensions (1.3.868); FILE MERGED
2007/09/28 18:33:59 fs 1.3.868.1: #i81612# warning-free code (wntmsci10)
-rw-r--r--extensions/source/activex/main/StdAfx2.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/extensions/source/activex/main/StdAfx2.h b/extensions/source/activex/main/StdAfx2.h
index 7077ae20b5c9..c7e2997e0c6d 100644
--- a/extensions/source/activex/main/StdAfx2.h
+++ b/extensions/source/activex/main/StdAfx2.h
@@ -16,6 +16,15 @@
#define _ATL_APARTMENT_THREADED
#define _ATL_STATIC_REGISTRY
+#pragma warning (disable:4505)
+ // globally disable "unreferenced local function has been removed"
+
+#pragma warning (push,1)
+#pragma warning (disable:4548)
+ // expression before comma has no effect; expected expression with side-effect
+#pragma warning (disable:4555)
+ // expression has no effect; expected expression with side-effect
+
#define min(a, b) (((a) < (b)) ? (a) : (b))
#include <atlbase.h>
@@ -25,6 +34,8 @@ extern CComModule _Module;
#include <atlcom.h>
#include <atlctl.h>
+#pragma warning (pop)
+
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.