diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:28:30 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:28:30 +0000 |
commit | ade48432ba45aceb06c912c842952d4135a0448c (patch) | |
tree | 1ce5e77d7be3e83a2a946beebe906a7b3edebc5a /configmgr | |
parent | b48c4524678d650d1a66fda1e0ce204d53c52cb2 (diff) |
INTEGRATION: CWS warnings01 (1.4.60); FILE MERGED
2005/11/01 12:47:29 cd 1.4.60.3: #i53898# Warning free code for sun solaris compiler
2005/09/22 17:27:05 sb 1.4.60.2: RESYNC: (1.4-1.5); FILE MERGED
2005/09/06 12:27:44 cd 1.4.60.1: #i53898# Make code warning free
Diffstat (limited to 'configmgr')
-rw-r--r-- | configmgr/source/platformbe/systemintegrationmanager.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/configmgr/source/platformbe/systemintegrationmanager.cxx b/configmgr/source/platformbe/systemintegrationmanager.cxx index 9e9972f093..d6faa8982e 100644 --- a/configmgr/source/platformbe/systemintegrationmanager.cxx +++ b/configmgr/source/platformbe/systemintegrationmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: systemintegrationmanager.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 04:14:24 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:28:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,7 +97,7 @@ SystemIntegrationManager::~SystemIntegrationManager() } //------------------------------------------------------------------------------ void SAL_CALL SystemIntegrationManager::initialize( - const uno::Sequence<uno::Any>& aParameters) + const uno::Sequence<uno::Any>& /*aParameters*/) throw (uno::RuntimeException, uno::Exception, lang::IllegalArgumentException, backenduno::BackendSetupException) @@ -224,7 +224,7 @@ SystemIntegrationManager::PlatformBackendList SystemIntegrationManager::getSuppo //------------------------------------------------------------------------------ uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL SystemIntegrationManager::listLayers(const rtl::OUString& aComponent, - const rtl::OUString& aEntity) + const rtl::OUString& /*aEntity*/) throw (backenduno::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException) @@ -236,10 +236,10 @@ uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL uno::Reference<backenduno::XLayer> * pLayer = aLayers.getArray(); - for (sal_Int32 i=0 ; i< aUniversalBackends.size(); ++i, ++pLayer) + for (PlatformBackendList::size_type i=0 ; i< aUniversalBackends.size(); ++i, ++pLayer) *pLayer = aUniversalBackends[i]->getLayer(aComponent, rtl::OUString()); - for (sal_Int32 j=0 ; j< aSpecialBackends.size(); ++j, ++pLayer) + for (PlatformBackendList::size_type j=0 ; j< aSpecialBackends.size(); ++j, ++pLayer) *pLayer = aSpecialBackends[j]->getLayer(aComponent, rtl::OUString()); OSL_ASSERT( aLayers.getConstArray()+aLayers.getLength() == pLayer ); @@ -248,8 +248,8 @@ uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL //------------------------------------------------------------------------------ uno::Reference<backenduno::XUpdateHandler> SAL_CALL - SystemIntegrationManager::getUpdateHandler(const rtl::OUString& aComponent, - const rtl::OUString& aEntity) + SystemIntegrationManager::getUpdateHandler(const rtl::OUString& /*aComponent*/, + const rtl::OUString& /*aEntity*/) throw (backenduno::BackendAccessException, lang::NoSupportException, lang::IllegalArgumentException, @@ -260,8 +260,6 @@ uno::Reference<backenduno::XUpdateHandler> SAL_CALL rtl::OUString::createFromAscii( "SystemIntegrationManager: No Update Operation allowed, Read Only access"), *this) ; - return NULL; - } // --------------------------------------------------------------------------- // ComponentHelper |