#95257# Clarified semantics of XContentProviderManager.queryContentProvider()'s parameter.

2 files changed, 13 insertions, 10 deletions

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 80ecbb95afbf..4b752fce5dc9 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ucb.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kso $ $Date: 2001-06-25 08:50:27 $
+ *  last change: $Author: sb $ $Date: 2001-11-28 09:42:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -377,10 +377,11 @@ com::sun::star::uno::Sequence< ContentProviderInfo > SAL_CALL
 //=========================================================================
 // virtual
 Reference< XContentProvider > SAL_CALL
-        UniversalContentBroker::queryContentProvider( const OUString& Scheme )
+        UniversalContentBroker::queryContentProvider( const OUString&
+                                                          Identifier )
     throw( com::sun::star::uno::RuntimeException )
 {
-    return queryContentProvider( Scheme, sal_False );
+    return queryContentProvider( Identifier, sal_False );
 }
 
 //=========================================================================
@@ -566,11 +567,12 @@ void SAL_CALL UniversalContentBroker::abort( sal_Int32 CommandId )
 //=========================================================================
 
 Reference< XContentProvider > UniversalContentBroker::queryContentProvider(
-                                const OUString& Scheme, sal_Bool bResolved )
+                                const OUString& Identifier,
+                                sal_Bool bResolved )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
-    ProviderList_Impl const * pList = m_aProviders.map( Scheme );
+    ProviderList_Impl const * pList = m_aProviders.map( Identifier );
     return pList ? bResolved ? pList->front().getResolvedProvider()
                              : pList->front().getProvider()
                  : Reference< XContentProvider >();
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 0b5c878d0c23..4f27b43da568 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ucb.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kso $ $Date: 2001-02-02 08:21:39 $
+ *  last change: $Author: sb $ $Date: 2001-11-28 09:42:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -191,7 +191,7 @@ public:
         throw( com::sun::star::uno::RuntimeException );
     virtual com::sun::star::uno::Reference<
         com::sun::star::ucb::XContentProvider > SAL_CALL
-    queryContentProvider( const rtl::OUString& Scheme )
+    queryContentProvider( const rtl::OUString& Identifier )
         throw( com::sun::star::uno::RuntimeException );
 
     // XContentProvider
@@ -232,7 +232,8 @@ public:
 
 private:
     com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >
-    queryContentProvider( const rtl::OUString& Scheme, sal_Bool bResolved );
+    queryContentProvider( const rtl::OUString& Identifier,
+                          sal_Bool bResolved );
 
     com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo >
     getCommandInfo();