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
This commit is contained in:
Ivo Hinkelmann 2008-01-14 13:49:20 +00:00
parent 88742a676c
commit f8266c95e5
2 changed files with 17 additions and 4 deletions

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: unotypewrapper.hxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -34,6 +34,10 @@
************************************************************************/ ************************************************************************/
#ifndef UNO_TYPE_WRAPPER_HXX #ifndef UNO_TYPE_WRAPPER_HXX
#define UNO_TYPE_WRAPPER_HXX #define UNO_TYPE_WRAPPER_HXX
#pragma warning (push,1)
#pragma warning (disable:4548)
#include <tools/presys.h> #include <tools/presys.h>
//#include "stdafx.h" //#include "stdafx.h"
#define STRICT #define STRICT
@ -47,6 +51,10 @@ extern CComModule _Module;
#include <atlcom.h> #include <atlcom.h>
#include <tools/postsys.h> #include <tools/postsys.h>
#pragma warning (pop)
#pragma warning (disable:4505)
// disable "unreferenced local function has been removed" globally
#include "comifaces.hxx" #include "comifaces.hxx"
/* creates an UnoTypWrapper and sets the Name property to the value /* creates an UnoTypWrapper and sets the Name property to the value

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: windata.hxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -35,8 +35,13 @@
#ifndef AUTOMATION_BRIDGE_WINDATA_HXX #ifndef AUTOMATION_BRIDGE_WINDATA_HXX
#define 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 "oleidl.h"
#include <atlbase.h> #include <atlbase.h>
#pragma warning (pop)
#include "osl/diagnose.h" #include "osl/diagnose.h"
namespace ole_adapter namespace ole_adapter