summaryrefslogtreecommitdiff
path: root/extensions/source/ole
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-01-14 13:49:20 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-01-14 13:49:20 +0000
commitf8266c95e55541fd5f849c5bef1cc6a3ef58d839 (patch)
tree6004009cc8afac7e29db5de9f0baa1058b79956f /extensions/source/ole
parent88742a676c8389f5dfc8b554e74fe24758f65808 (diff)
INTEGRATION: CWS wae4extensions (1.3.388); FILE MERGED
2007/10/01 12:13:45 fs 1.3.388.1: #i81612# warning-free code (wntmsci10) - approved by jl@openoffice.org
Diffstat (limited to 'extensions/source/ole')
-rw-r--r--extensions/source/ole/unotypewrapper.hxx12
-rw-r--r--extensions/source/ole/windata.hxx9
2 files changed, 17 insertions, 4 deletions
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index bddcf11c8f15..149563e7d1f8 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: unotypewrapper.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 19:46:41 $
+ * last change: $Author: ihi $ $Date: 2008-01-14 14:49:08 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -34,6 +34,10 @@
************************************************************************/
#ifndef UNO_TYPE_WRAPPER_HXX
#define UNO_TYPE_WRAPPER_HXX
+
+#pragma warning (push,1)
+#pragma warning (disable:4548)
+
#include <tools/presys.h>
//#include "stdafx.h"
#define STRICT
@@ -47,6 +51,10 @@ extern CComModule _Module;
#include <atlcom.h>
#include <tools/postsys.h>
+#pragma warning (pop)
+#pragma warning (disable:4505)
+ // disable "unreferenced local function has been removed" globally
+
#include "comifaces.hxx"
/* creates an UnoTypWrapper and sets the Name property to the value
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index 048b7bfaccde..d5894c71b792 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: windata.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 19:47:13 $
+ * last change: $Author: ihi $ $Date: 2008-01-14 14:49:20 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -35,8 +35,13 @@
#ifndef AUTOMATION_BRIDGE_WINDATA_HXX
#define AUTOMATION_BRIDGE_WINDATA_HXX
+#pragma warning (push,1)
+#pragma warning (disable:4668)
+#pragma warning (disable:4548)
#include "oleidl.h"
+
#include <atlbase.h>
+#pragma warning (pop)
#include "osl/diagnose.h"
namespace ole_adapter