summaryrefslogtreecommitdiff
path: root/extensions/source/ole
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-01-14 13:47:12 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-01-14 13:47:12 +0000
commit4aee0970503ae4e9e85228b85b72474d52247bdb (patch)
tree64e5eecc3866736e722fcb8369496d21bfca176f /extensions/source/ole
parenta202b43617b5e45abc386ae6ce98105d343bfc9c (diff)
INTEGRATION: CWS wae4extensions (1.9.246); FILE MERGED
2007/10/01 12:13:44 fs 1.9.246.1: #i81612# warning-free code (wntmsci10) - approved by jl@openoffice.org
Diffstat (limited to 'extensions/source/ole')
-rw-r--r--extensions/source/ole/oleobjw.hxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index f36d102e7736..3f63fd21eec5 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: oleobjw.hxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: hr $ $Date: 2006-06-19 10:45:08 $
+ * last change: $Author: ihi $ $Date: 2008-01-14 14:47:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -37,6 +37,9 @@
#define __OLEOBJW_HXX
#include "ole2uno.hxx"
+#pragma warning (push,1)
+#pragma warning (disable:4548)
+
#include <tools/presys.h>
#define _WIN32_WINNT 0x0400
@@ -48,6 +51,8 @@
#include <hash_map>
#include <tools/postsys.h>
+#pragma warning (pop)
+
#ifndef _CPPUHELPER_IMPLBASE3_HXX_
#include <cppuhelper/implbase3.hxx>
#endif