diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 13:48:00 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 13:48:00 +0000 |
| commit | 329f61b431779d4277f88810e19c5393f68a4a2c (patch) | |
| tree | 8cff83c12c54cd10db86d238cefe3ff58a42aced /extensions/source/ole | |
| parent | ded2b00c612f772d34634d0d4694084cc5d1f770 (diff) | |
INTEGRATION: CWS wae4extensions (1.7.90); FILE MERGED
2007/10/01 12:13:44 fs 1.7.90.1: #i81612# warning-free code (wntmsci10) - approved by jl@openoffice.org
Diffstat (limited to 'extensions/source/ole')
| -rw-r--r-- | extensions/source/ole/oledll.cxx | 9 | ||||
| -rw-r--r-- | extensions/source/ole/servreg.cxx | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx index 3f00f3aa63b8..84a1df12c676 100644 --- a/extensions/source/ole/oledll.cxx +++ b/extensions/source/ole/oledll.cxx @@ -4,9 +4,9 @@ * * $RCSfile: oledll.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:07:13 $ + * last change: $Author: ihi $ $Date: 2008-01-14 14:46:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,9 @@ #define _WIN32_WINNT 0x0400 #define _WIN32_DCOM +#pragma warning (push,1) +#pragma warning (disable:4548) + #if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_STLP_DEBUG) #undef _DEBUG #endif @@ -50,6 +53,8 @@ CComModule _Module; #include <atlcom.h> +#pragma warning (pop) + BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index 546ec49711f0..ab68c73deee3 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: servreg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:08:26 $ + * last change: $Author: ihi $ $Date: 2008-01-14 14:48:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,7 +85,7 @@ Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiS } // end namespace extern "C" void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; @@ -131,7 +131,7 @@ extern "C" void * SAL_CALL component_getFactory( } -extern "C" sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) +extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) { if (pRegistryKey) { @@ -173,7 +173,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void } extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) + const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } |