INTEGRATION: CWS bgdlremove (1.6.28); FILE MERGED

2007/05/18 11:38:08 kso 1.6.28.2: #i77419# - cleanup of ucbhelper namespaces.
2007/05/11 12:52:52 kso 1.6.28.1: #i76911# - ucbhelper no longer uses VOS

2 files changed, 34 insertions, 42 deletions

diff --git a/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx
index ba43b0f4a038..4280433126f3 100644
--- a/ucbhelper/source/provider/configureucb.cxx
+++ b/ucbhelper/source/provider/configureucb.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: configureucb.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 17:21:20 $
+ *  last change: $Author: ihi $ $Date: 2007-06-05 14:53:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -58,9 +58,8 @@
 #ifndef _RTL_USTRBUF_HXX_
 #include <rtl/ustrbuf.hxx>
 #endif
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
-#endif
+
+#include "osl/diagnose.h"
 
 #ifndef _UCBHELPER_PROVCONF_HXX_
 #include <provconf.hxx>
@@ -69,14 +68,9 @@
 #include <registerucb.hxx>
 #endif
 
-namespace unnamed_ucbhelper_configureucb {}
-using namespace unnamed_ucbhelper_configureucb;
-    // unnamed namespaces don't work well yet...
-
-using namespace com::sun;
 using namespace com::sun::star;
 
-namespace unnamed_ucbhelper_configureucb {
+namespace {
 
 bool fillPlaceholders(rtl::OUString const & rInput,
                       uno::Sequence< uno::Any > const & rReplacements,
@@ -153,7 +147,7 @@ bool fillPlaceholders(rtl::OUString const & rInput,
 
 }
 
-namespace ucb {
+namespace ucbhelper {
 
 //============================================================================
 //
@@ -163,7 +157,7 @@ namespace ucb {
 
 bool
 configureUcb(
-    uno::Reference< star::ucb::XContentProviderManager > const & rManager,
+    uno::Reference< ucb::XContentProviderManager > const & rManager,
     uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory,
     ContentProviderDataList const & rData,
     ContentProviderRegistrationInfoList * pInfos)
@@ -196,7 +190,7 @@ configureUcb(
 
 bool
 configureUcb(
-    uno::Reference< star::ucb::XContentProviderManager > const & rManager,
+    uno::Reference< ucb::XContentProviderManager > const & rManager,
     uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory,
     uno::Sequence< uno::Any > const & rArguments,
     std::vector< ContentProviderRegistrationInfo > * pInfos)
@@ -207,14 +201,14 @@ configureUcb(
     if (rArguments.getLength() < 2
         || !(rArguments[0] >>= aKey1) || !(rArguments[1] >>= aKey2))
     {
-        VOS_ENSURE(false, "ucb::configureUcb(): Bad arguments");
+        OSL_ENSURE(false, "ucb::configureUcb(): Bad arguments");
         return false;
     }
 
     ContentProviderDataList aData;
     if (!getContentProviderData(rServiceFactory, aKey1, aKey2, aData))
     {
-        VOS_ENSURE(false, "ucb::configureUcb(): No configuration");
+        OSL_ENSURE(false, "ucb::configureUcb(): No configuration");
         return false;
     }
 
@@ -234,13 +228,13 @@ configureUcb(
                                           aProviderArguments,
                                           aIt->URLTemplate,
                                           &aInfo);
-            VOS_ENSURE(bSuccess, "ucb::configureUcb(): Bad content provider");
+            OSL_ENSURE(bSuccess, "ucb::configureUcb(): Bad content provider");
 
             if (bSuccess && pInfos)
                 pInfos->push_back(aInfo);
         }
         else
-            VOS_ENSURE(false,
+            OSL_ENSURE(false,
                        "ucb::configureUcb(): Bad argument placeholders");
     }
 
@@ -255,11 +249,11 @@ configureUcb(
 //
 //============================================================================
 
-namespace ucb {
+namespace ucbhelper {
 
 void
 unconfigureUcb(
-    uno::Reference< star::ucb::XContentProviderManager > const & rManager,
+    uno::Reference< ucb::XContentProviderManager > const & rManager,
     std::vector< ContentProviderRegistrationInfo > const & rInfos)
     throw (uno::RuntimeException)
 {
diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx
index 3f54192499b3..c3946678b8c6 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: registerucb.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 17:23:22 $
+ *  last change: $Author: ihi $ $Date: 2007-06-05 14:55:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -55,18 +55,16 @@
 #ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HPP_
 #include <com/sun/star/uno/RuntimeException.hpp>
 #endif
-#ifndef _VOS_DIAGNOSE_H_
-#include <vos/diagnose.hxx>
-#endif
+
+#include "osl/diagnose.h"
 
 #ifndef _UCBHELPER_CONFIGUREUCB_HXX_
 #include <ucbhelper/configureucb.hxx>
 #endif
 
-using namespace com::sun;
 using namespace com::sun::star;
 
-namespace ucb {
+namespace ucbhelper {
 
 //============================================================================
 //
@@ -76,7 +74,7 @@ namespace ucb {
 
 bool
 registerAtUcb(
-    uno::Reference< star::ucb::XContentProviderManager > const & rManager,
+    uno::Reference< ucb::XContentProviderManager > const & rManager,
     uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory,
     rtl::OUString const & rName,
     rtl::OUString const & rArguments,
@@ -84,7 +82,7 @@ registerAtUcb(
     ContentProviderRegistrationInfo * pInfo)
     throw (uno::RuntimeException)
 {
-    VOS_ENSURE(rServiceFactory.is(),
+    OSL_ENSURE(rServiceFactory.is(),
                "ucb::registerAtUcb(): No service factory");
 
     bool bNoProxy
@@ -97,14 +95,14 @@ registerAtUcb(
                                rArguments);
 
     // First, try to instantiate proxy for provider:
-    uno::Reference< star::ucb::XContentProvider > xProvider;
+    uno::Reference< ucb::XContentProvider > xProvider;
     if (!bNoProxy)
     {
-        uno::Reference< star::ucb::XContentProviderFactory > xProxyFactory;
+        uno::Reference< ucb::XContentProviderFactory > xProxyFactory;
         try
         {
             xProxyFactory
-                = uno::Reference< star::ucb::XContentProviderFactory >(
+                = uno::Reference< ucb::XContentProviderFactory >(
                       rServiceFactory->
                           createInstance(
                               rtl::OUString(
@@ -113,7 +111,7 @@ registerAtUcb(
                       uno::UNO_QUERY);
         }
         catch (uno::Exception const &) {}
-        VOS_ENSURE(xProxyFactory.is(), "No ContentProviderProxyFactory");
+        OSL_ENSURE(xProxyFactory.is(), "No ContentProviderProxyFactory");
         if (xProxyFactory.is())
             xProvider = xProxyFactory->createContentProvider(rName);
     }
@@ -122,20 +120,20 @@ registerAtUcb(
     if (!xProvider.is())
         try
         {
-            xProvider = uno::Reference< star::ucb::XContentProvider >(
+            xProvider = uno::Reference< ucb::XContentProvider >(
                             rServiceFactory->createInstance(rName),
                             uno::UNO_QUERY);
         }
         catch (uno::RuntimeException const &) { throw; }
         catch (uno::Exception const &) {}
 
-    uno::Reference< star::ucb::XContentProvider >
+    uno::Reference< ucb::XContentProvider >
         xOriginalProvider(xProvider);
-    uno::Reference< star::ucb::XParameterizedContentProvider >
+    uno::Reference< ucb::XParameterizedContentProvider >
         xParameterized(xProvider, uno::UNO_QUERY);
     if (xParameterized.is())
     {
-        uno::Reference< star::ucb::XContentProvider > xInstance;
+        uno::Reference< ucb::XContentProvider > xInstance;
         try
         {
             xInstance = xParameterized->registerInstance(rTemplate,
@@ -157,7 +155,7 @@ registerAtUcb(
             rManager->registerContentProvider(xProvider, rTemplate, true);
             bSuccess = true;
         }
-        catch (star::ucb::DuplicateProviderException const &)
+        catch (ucb::DuplicateProviderException const &)
         {
             if (xParameterized.is())
                 try
@@ -197,17 +195,17 @@ registerAtUcb(
 
 void
 deregisterFromUcb(
-    uno::Reference< star::ucb::XContentProviderManager > const & rManager,
+    uno::Reference< ucb::XContentProviderManager > const & rManager,
     ContentProviderRegistrationInfo const & rInfo)
     throw (uno::RuntimeException)
 {
-    uno::Reference< star::ucb::XContentProvider >
+    uno::Reference< ucb::XContentProvider >
         xProvider(rInfo.m_xProvider);
-    uno::Reference< star::ucb::XParameterizedContentProvider >
+    uno::Reference< ucb::XParameterizedContentProvider >
         xParameterized(xProvider, uno::UNO_QUERY);
     if (xParameterized.is())
     {
-        uno::Reference< star::ucb::XContentProvider > xInstance;
+        uno::Reference< ucb::XContentProvider > xInstance;
         try
         {
             xInstance