diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 13:47:35 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 13:47:35 +0000 |
commit | bfbab94f4009f4e08872ed69c4e4550baaad12bb (patch) | |
tree | 446096c54ba063c5540a1b018d4e12356e4a816d /extensions/source/ole | |
parent | a3f623d7200a86dbea149b05d2feaece8dd403e2 (diff) |
INTEGRATION: CWS wae4extensions (1.18.68); FILE MERGED
2007/10/01 12:13:44 fs 1.18.68.1: #i81612# warning-free code (wntmsci10) - approved by jl@openoffice.org
Diffstat (limited to 'extensions/source/ole')
-rw-r--r-- | extensions/source/ole/servprov.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index da9bb6864367..16b8acd28027 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -4,9 +4,9 @@ * * $RCSfile: servprov.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: ihi $ $Date: 2007-06-04 13:54:38 $ + * last change: $Author: ihi $ $Date: 2008-01-14 14:47:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -221,7 +221,7 @@ STDMETHODIMP ProviderOleWrapper_Impl::CreateInstance(IUnknown FAR* punkOuter, return ret; } -STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int fLock) +STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int /*fLock*/) { return NOERROR; } @@ -359,7 +359,7 @@ STDMETHODIMP OneInstanceOleWrapper_Impl::CreateInstance(IUnknown FAR* punkOuter, return ret; } -STDMETHODIMP OneInstanceOleWrapper_Impl::LockServer(int fLock) +STDMETHODIMP OneInstanceOleWrapper_Impl::LockServer(int /*fLock*/) { return NOERROR; } @@ -611,7 +611,7 @@ Reference<XInterface> SAL_CALL OleClient_Impl::createInstance(const OUString& Se return ret; } -Reference<XInterface> SAL_CALL OleClient_Impl::createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& Arguments) throw (Exception, RuntimeException) +Reference<XInterface> SAL_CALL OleClient_Impl::createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/) throw (Exception, RuntimeException) { return createInstance( ServiceSpecifier); } @@ -670,6 +670,7 @@ OleServer_Impl::OleServer_Impl( const Reference<XMultiServiceFactory>& smgr): sal_Bool bOLERegister = sal_True; #endif sal_Bool ret = provideInstance( m_smgr, (GUID*)&OID_ServiceManager, bOLERegister ); + (void)ret; } OleServer_Impl::~OleServer_Impl() @@ -737,8 +738,6 @@ Sequence< sal_Int8 > SAL_CALL OleServer_Impl::getImplementationId() throw(Runtim sal_Bool OleServer_Impl::provideService(const Reference<XSingleServiceFactory>& xSFact, GUID* guid) { - sal_Bool ret = FALSE; - IClassFactoryWrapper* pFac = new ProviderOleWrapper_Impl( m_smgr, xSFact, guid); pFac->AddRef(); @@ -750,8 +749,6 @@ sal_Bool OleServer_Impl::provideService(const Reference<XSingleServiceFactory>& sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUID* guid, sal_Bool bAsApplication ) { - sal_Bool ret = FALSE; - IClassFactoryWrapper* pFac = new OneInstanceOleWrapper_Impl( m_smgr, xInst, guid, bAsApplication ); pFac->AddRef(); |