mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.3.16); FILE MERGED

Browse Source 
2006/02/20 15:31:46 cd 1.3.16.1: #i55991# Warning free code for Windows C++ compiler
This commit is contained in:
Jens-Heiner Rechtien
2006-06-20 04:41:18 +00:00
parent d5c1a4fa7f
commit 92ca9c64a0
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
embedserv/source/embed/register.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: register.cxx,v $ * $RCSfile: register.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 18:53:49 $ * last change: $Author: hr $ $Date: 2006-06-20 05:41:18 $
* *
* 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.
@@ -33,8 +33,6 @@
* *
************************************************************************/ ************************************************************************/
//#include <rtl/unload.h>
//#include <osl/time.h>
#include "servprov.hxx" #include "servprov.hxx"
#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
@@ -50,19 +48,20 @@
#include <com/sun/star/registry/InvalidRegistryException.hpp> #include <com/sun/star/registry/InvalidRegistryException.hpp>
#endif #endif
#ifndef _RTL_USTRING_ #ifndef _RTL_USTRING_H_
#include <rtl/ustring> #include <rtl/ustring.h>
#endif #endif
#ifndef _CPPUHELPER_FACTORY_HXX_ #ifndef _CPPUHELPER_FACTORY_HXX_
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
#endif #endif
using namespace ::com::sun::star; using namespace ::com::sun::star;
uno::Reference<uno::XInterface> SAL_CALL EmbedServer_createInstance( uno::Reference<uno::XInterface> SAL_CALL EmbedServer_createInstance(
const uno::Reference<lang::XMultiServiceFactory> & xSMgr) const uno::Reference<lang::XMultiServiceFactory> & xSMgr)
throw (uno::Exception) throw (uno::Exception)
{ {
uno::Reference<uno::XInterface > xService = *new EmbedServer_Impl( xSMgr ); uno::Reference<uno::XInterface > xService = *new EmbedServer_Impl( xSMgr );
return xService; return xService;
@@ -83,12 +82,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames()
extern "C" { extern "C" {
void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = 0; void * pRet = 0;
@@ -112,7 +111,7 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
return pRet; return pRet;
} }
sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
{ {
if (pRegistryKey) if (pRegistryKey)
{ {
@@ -126,19 +125,25 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
EmbedServer_getImplementationName() + EmbedServer_getImplementationName() +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames(); uno::Sequence< ::rtl::OUString > rServices = EmbedServer_getSupportedServiceNames();
for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
xNewKey->createKey( rServices.getConstArray()[ind] ); xNewKey->createKey( rServices.getConstArray()[ind] );
return sal_True; return sal_True;
} }
catch (registry::InvalidRegistryException &) catch (registry::InvalidRegistryException &)
{ {
OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
} }
} return sal_False;
return sal_False;
} }
} // extern "C" } // extern "C"
// Fix strange warnings about some
// ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
// warning C4505: 'xxx' : unreferenced local function has been removed
#if defined(_MSC_VER)
#pragma warning(disable: 4505)
#endif