diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:25:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:25:16 +0000 |
| commit | ab8882f9f583f2da1294a3444a8119ff54922353 (patch) | |
| tree | 16f50cd07cb65596c971f686b046012fd4c3cae8 /shell | |
| parent | b3ebb4ff0236aeb658333ceeede3284c85fde57b (diff) | |
INTEGRATION: CWS warnings01 (1.2.14); FILE MERGED
2006/03/10 15:11:04 pl 1.2.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/simplemail/smplmailentry.cxx | 12 | ||||
| -rw-r--r-- | shell/source/win32/workbench/TestProxySet.cxx | 10 |
2 files changed, 14 insertions, 8 deletions
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 5285b08cd58f..acb2457db777 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -4,9 +4,9 @@ * * $RCSfile: smplmailentry.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:09:21 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:24:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,7 +79,7 @@ using com::sun::star::system::XSimpleMailClientSupplier; namespace { - Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) + Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( static_cast< XSimpleMailClientSupplier* >( new CSmplMailSuppl( ) ) ); } @@ -97,7 +97,7 @@ extern "C" //---------------------------------------------------------------------- void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) + const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -106,7 +106,7 @@ void SAL_CALL component_getImplementationEnvironment( // //----------------------------------------------------------------------- -sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey ) +sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) { sal_Bool bRetVal = sal_True; @@ -133,7 +133,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey ) +void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx index a782b253ecc9..e46515ba16c1 100644 --- a/shell/source/win32/workbench/TestProxySet.cxx +++ b/shell/source/win32/workbench/TestProxySet.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TestProxySet.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:11:24 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:25:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,7 +73,13 @@ #ifdef WNT #include <stdio.h> +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif #endif |