diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:16:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:16:23 +0000 |
| commit | 91b0e6e7c78ae14e8fe44c29719662492786f005 (patch) | |
| tree | cb9d242f90933c75468c241db3e55f42f59e2574 /ucb | |
| parent | 1bd667d2458d892db1538ddfb5bafd2ceb450972 (diff) | |
INTEGRATION: CWS warnings01 (1.6.12); FILE MERGED
2006/03/10 15:40:10 sb 1.6.12.2: #i53898# Made code warning-free.
2005/11/09 21:01:36 sb 1.6.12.1: #i53898# Made code warning-free.
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/core/provprox.cxx | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 04010ca291da..4476f5f9d1af 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: provprox.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2005-09-30 10:09:44 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:16:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -175,7 +175,7 @@ UcbContentProviderProxy::queryInterface( const Type & rType ) { // Get original provider an forward the call... osl::Guard< osl::Mutex > aGuard( m_aMutex ); - Reference< XInterface > xProvider = getContentProvider(); + Reference< XContentProvider > xProvider = getContentProvider(); if ( xProvider.is() ) aRet = xProvider->queryInterface( rType ); } @@ -205,22 +205,13 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() } else { - static cppu::OTypeCollection * pCollection = 0; - if ( !pCollection ) - { - osl::Guard< osl::Mutex > aGuard( m_aMutex ); - if ( !pCollection ) - { - static cppu::OTypeCollection collection( - CPPU_TYPE_REF( XTypeProvider ), - CPPU_TYPE_REF( XServiceInfo ), - CPPU_TYPE_REF( XContentProvider ), - CPPU_TYPE_REF( XParameterizedContentProvider ), - CPPU_TYPE_REF( XContentProviderSupplier ) ); - pCollection = &collection; - } - } - return (*pCollection).getTypes(); + static cppu::OTypeCollection collection( + CPPU_TYPE_REF( XTypeProvider ), + CPPU_TYPE_REF( XServiceInfo ), + CPPU_TYPE_REF( XContentProvider ), + CPPU_TYPE_REF( XParameterizedContentProvider ), + CPPU_TYPE_REF( XContentProviderSupplier ) ); + return collection.getTypes(); } } |