INTEGRATION: CWS bgdlremove (1.6.64); FILE MERGED

2007/05/18 11:38:08 kso 1.6.64.1: #i77419# - cleanup of ucbhelper namespaces.

3 files changed, 10 insertions, 10 deletions

diff --git a/ucbhelper/inc/ucbhelper/configureucb.hxx b/ucbhelper/inc/ucbhelper/configureucb.hxx
index acded33f74ea..867f50fa7d32 100644
--- a/ucbhelper/inc/ucbhelper/configureucb.hxx
+++ b/ucbhelper/inc/ucbhelper/configureucb.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: configureucb.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 16:26:11 $
+ *  last change: $Author: ihi $ $Date: 2007-06-05 14:48:12 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -63,7 +63,7 @@ namespace com { namespace sun { namespace star {
     namespace uno { class Any; }
 } } }
 
-namespace ucb {
+namespace ucbhelper {
 
 //============================================================================
 /** Information about a registered content provider, passed from
diff --git a/ucbhelper/inc/ucbhelper/contentbroker.hxx b/ucbhelper/inc/ucbhelper/contentbroker.hxx
index a76d77f53894..41175133d1f7 100644
--- a/ucbhelper/inc/ucbhelper/contentbroker.hxx
+++ b/ucbhelper/inc/ucbhelper/contentbroker.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: contentbroker.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 16:26:55 $
+ *  last change: $Author: ihi $ $Date: 2007-06-05 14:48:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -61,7 +61,7 @@ namespace com { namespace sun { namespace star { namespace ucb {
 #include "ucbhelper/ucbhelperdllapi.h"
 #endif
 
-namespace ucb
+namespace ucbhelper
 {
 
 class ContentBroker_Impl;
@@ -217,6 +217,6 @@ public:
     getCommandProcessorInterface() const;
 };
 
-} /* namespace ucb */
+} /* namespace ucbhelper */
 
 #endif /* !_UCBHELPER_CONTENTBROKER_HXX */
diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
index 2553056be50d..1e30790b6e5f 100644
--- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
+++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fileidentifierconverter.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 16:28:11 $
+ *  last change: $Author: ihi $ $Date: 2007-06-05 14:49:32 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -54,7 +54,7 @@ namespace com { namespace sun { namespace star { namespace ucb {
 } } } }
 namespace rtl { class OUString; }
 
-namespace ucb {
+namespace ucbhelper {
 
 //============================================================================
 /** Get a 'root' URL for the most 'local' file content provider.