INTEGRATION: CWS bgdlremove (1.5.26); FILE MERGED

2007/05/11 09:17:38 kso 1.5.26.1: 76911# - ucbhelper lib no longer uses VOS.
(vos::ORef => rtl::Reference, vos::OMutex => osl::Mutex, ...)

1 files changed, 23 insertions, 31 deletions

diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index e61249549416..b209f613d344 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: services.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 01:18:24 $
+ *  last change: $Author: ihi $ $Date: 2007-06-05 18:29:18 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -49,27 +49,25 @@
 #include <provider/provider.hxx>
 #endif
 
-using namespace rtl;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::registry;
+using namespace com::sun::star;
 
 //=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const OUString & rImplementationName,
-                              Sequence< OUString > const & rServiceNames )
+static sal_Bool writeInfo(
+    void * pRegistryKey,
+    const rtl::OUString & rImplementationName,
+    uno::Sequence< rtl::OUString > const & rServiceNames )
 {
-    OUString aKeyName( OUString::createFromAscii( "/" ) );
+    rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
     aKeyName += rImplementationName;
-    aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
 
-    Reference< XRegistryKey > xKey;
+    uno::Reference< registry::XRegistryKey > xKey;
     try
     {
-        xKey = static_cast< XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
+        xKey = static_cast< registry::XRegistryKey * >(
+            pRegistryKey )->createKey( aKeyName );
     }
-    catch ( InvalidRegistryException const & )
+    catch ( registry::InvalidRegistryException const & )
     {
     }
 
@@ -84,7 +82,7 @@ static sal_Bool writeInfo( void * pRegistryKey,
         {
             xKey->createKey( rServiceNames[ n ] );
         }
-        catch ( InvalidRegistryException const & )
+        catch ( registry::InvalidRegistryException const & )
         {
             bSuccess = sal_False;
             break;
@@ -95,26 +93,21 @@ static sal_Bool writeInfo( void * pRegistryKey,
 
 //=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
+    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
-    (void)ppEnv;
-
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
 //=========================================================================
 extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey )
+    void * /*pServiceManager*/, void * pRegistryKey )
 {
-    (void)pServiceManager;
-
     return pRegistryKey &&
 
     //////////////////////////////////////////////////////////////////////
     // Write info into registry.
     //////////////////////////////////////////////////////////////////////
 
-    // @@@ Adjust namespace names.
     writeInfo( pRegistryKey,
                ::chelp::ContentProvider::getImplementationName_Static(),
                ::chelp::ContentProvider::getSupportedServiceNames_Static() );
@@ -122,23 +115,22 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
 
 //=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+    const sal_Char * pImplName,
+    void * pServiceManager,
+    void * /*pRegistryKey*/ )
 {
-    (void)pRegistryKey;
-
     void * pRet = 0;
 
-    Reference< XMultiServiceFactory > xSMgr(
-            reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) );
-    Reference< XSingleServiceFactory > xFactory;
+    uno::Reference< lang::XMultiServiceFactory > xSMgr(
+        reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
+    uno::Reference< lang::XSingleServiceFactory > xFactory;
 
     //////////////////////////////////////////////////////////////////////
     // Create factory, if implementation name matches.
     //////////////////////////////////////////////////////////////////////
 
-    // @@@ Adjust namespace names.
     if ( ::chelp::ContentProvider::getImplementationName_Static().
-                compareToAscii( pImplName ) == 0 )
+             compareToAscii( pImplName ) == 0 )
     {
         xFactory = ::chelp::ContentProvider::createServiceFactory( xSMgr );
     }