Switch from autodoc to doxygen for SDK C++ documentation.

* New build prerequisite doxygen (controllable via --with-doxygen). * Adapted various headers to slightly different doxygen documentation syntax, but much clean up still remains to be done (i.e., warnings emitted by doxygen fixed).
author: Stephan Bergmann <sbergman@redhat.com> 2012-01-05 19:40:38 +0100
committer: Stephan Bergmann <sbergman@redhat.com> 2012-01-05 19:43:14 +0100
commit: 58ab12acf576a765ec47cc2753ba57643e51d653 (patch)
tree: 79c07bddbdf3e8e6db677eb0b94e8a2880d308c1 /cppuhelper
parent: 7482e974117df2bdc737785efdf9eb410787c7b4 (diff)
42 files changed, 726 insertions, 828 deletions
diff --git a/cppuhelper/inc/cppuhelper/basemutex.hxx b/cppuhelper/inc/cppuhelper/basemutex.hxx
index f145709095fb..a00cb2aef550 100644
--- a/cppuhelper/inc/cppuhelper/basemutex.hxx
+++ b/cppuhelper/inc/cppuhelper/basemutex.hxx
@@ -34,12 +34,12 @@
 namespace cppu
 {
     /** base class for all classes who want derive from
-     ::cppu::WeakComponentImplHelperXX.
+     cppu::WeakComponentImplHelperXX.
 
      Implmentation classes have first to derive from BaseMutex and then from
-     ::cppu::WeakComponentImplHelperXX to ensure that the BaseMutex is completely
+     cppu::WeakComponentImplHelperXX to ensure that the BaseMutex is completely
      initialized when the mutex is used to intialize the
-     ::cppu::WeakComponentImplHelperXX
+     cppu::WeakComponentImplHelperXX
     */
     class BaseMutex
     {
diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx
index cef4f2e8075c..41c69ad3cc0e 100644
--- a/cppuhelper/inc/cppuhelper/bootstrap.hxx
+++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx
@@ -198,12 +198,11 @@ private:
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
 SAL_CALL bootstrap();
 
+/// @cond INTERNAL
 /**
  * Helper function to expand vnd.sun.star.expand URLs in contexts where no
  * properly bootstrapped UNO is (yet) available.
  *
- * @internal
- *
  * @param uri
  * Some URI (but not a URI reference).
  *
@@ -219,6 +218,7 @@ SAL_CALL bootstrap();
  */
 CPPUHELPER_DLLPUBLIC ::rtl::OUString
 SAL_CALL bootstrap_expandUri(::rtl::OUString const & uri);
+/// @endcond
 
 } // end namespace cppu
 
diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx
index 5827c630da23..eb57e18fd4b7 100644
--- a/cppuhelper/inc/cppuhelper/compbase.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase.hxx
@@ -35,8 +35,8 @@
    @deprecated
 */
 
-//==================================================================================================
-/** @internal */
+/// @cond INTERNAL
+
 #define __DEF_COMPIMPLHELPER_A( N ) \
 namespace cppu \
 { \
@@ -95,24 +95,22 @@ public: \
         { return getClassData( s_aCD ).getImplementationId(); } \
 };
 
-//==================================================================================================
-/** @internal */
 #define __DEF_COMPIMPLHELPER_B( N ) \
 template< __CLASS_IFC##N > \
 ClassData##N WeakComponentImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 4 ); \
 template< __CLASS_IFC##N > \
 ClassData##N WeakAggComponentImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 3 );
-//==================================================================================================
-/** @internal */
+
 #define __DEF_COMPIMPLHELPER_C( N ) \
 }
-//==================================================================================================
-/** @internal */
+
 #define __DEF_COMPIMPLHELPER( N ) \
 __DEF_COMPIMPLHELPER_A( N ) \
 __DEF_COMPIMPLHELPER_B( N ) \
 __DEF_COMPIMPLHELPER_C( N )
 
+/// @endcond
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx b/cppuhelper/inc/cppuhelper/compbase1.hxx
index ea657298d093..bc979f67524a 100644
--- a/cppuhelper/inc/cppuhelper/compbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase1.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {};
     public:
         inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {};
     public:
         inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {};
     public:
         inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/cppuhelper/inc/cppuhelper/compbase10.hxx
index ea7c2733677e..b1c262340540 100644
--- a/cppuhelper/inc/cppuhelper/compbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase10.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
         inline WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, PartialWeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
         inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
         inline WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx b/cppuhelper/inc/cppuhelper/compbase11.hxx
index 6f7c383a3045..6e8df92d3af0 100644
--- a/cppuhelper/inc/cppuhelper/compbase11.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase11.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
     public:
         inline WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, PartialWeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
     public:
         inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
     public:
         inline WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase12.hxx b/cppuhelper/inc/cppuhelper/compbase12.hxx
index c965a7ae59b9..0656c8328c26 100644
--- a/cppuhelper/inc/cppuhelper/compbase12.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase12.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
         inline WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, PartialWeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
         inline PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
         inline WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/cppuhelper/inc/cppuhelper/compbase2.hxx
index ea755ca448ee..e07f72ec1453 100644
--- a/cppuhelper/inc/cppuhelper/compbase2.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase2.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakComponentImplHelper2<Ifc1, Ifc2> > > {};
     public:
         inline WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, PartialWeakComponentImplHelper2<Ifc1, Ifc2> > > {};
     public:
         inline PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
@@ -125,12 +123,12 @@ namespace cppu
     };
 
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -148,7 +146,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggComponentImplHelper2<Ifc1, Ifc2> > > {};
     public:
         inline WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx
index 425101f1c1eb..388cd1579a8b 100644
--- a/cppuhelper/inc/cppuhelper/compbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase3.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
         inline WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, PartialWeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
         inline PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
         inline WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/cppuhelper/inc/cppuhelper/compbase4.hxx
index 438f041b986b..359331a08120 100644
--- a/cppuhelper/inc/cppuhelper/compbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase4.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
         inline WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, PartialWeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
         inline PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
         inline WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx
index a010253d6811..78168f26f30b 100644
--- a/cppuhelper/inc/cppuhelper/compbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase5.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
         inline WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, PartialWeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
         inline PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
         inline WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/cppuhelper/inc/cppuhelper/compbase6.hxx
index ee168e0374eb..f31c05772b9d 100644
--- a/cppuhelper/inc/cppuhelper/compbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase6.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
         inline WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, PartialWeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
         inline PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
         inline WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx
index f7ef3e143a3c..6ca62f714ecb 100644
--- a/cppuhelper/inc/cppuhelper/compbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase7.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
         inline WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, PartialWeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
         inline PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
         inline WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/cppuhelper/inc/cppuhelper/compbase8.hxx
index aa7e6837c44b..4dc8da17eb56 100644
--- a/cppuhelper/inc/cppuhelper/compbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase8.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
         inline WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, PartialWeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
         inline PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
@@ -124,12 +122,12 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -147,7 +145,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
         inline WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx
index 1e1660f33625..0c1e0cf98822 100644
--- a/cppuhelper/inc/cppuhelper/compbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase9.hxx
@@ -43,12 +43,12 @@ namespace cppu
 #pragma disable_warn
 #endif
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
 
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.
+        com::sun::star::uno::WeakReference.
 
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
@@ -63,7 +63,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
         inline WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
@@ -106,7 +105,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, PartialWeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
         inline PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
@@ -124,11 +122,11 @@ namespace cppu
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
-    /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::lang::XComponent.
+    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
+        com::sun::star::lang::XComponent.
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
-        ::com::sun::star::uno::WeakReference.  Object of this class can be
+        com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
 
         @attention
@@ -146,7 +144,6 @@ namespace cppu
         , public ::com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
         inline WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
index 23515a8431ae..ca7e0ccfdefa 100644
--- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
@@ -34,13 +34,13 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include "cppuhelperdllapi.h"
 
+/// @cond INTERNAL
 
 namespace cppu
 {
 
 /** Implementation helper base class for components. Inherits from ::cppu::OWeakObject and
     ::com::sun::star::lang::XComponent.
-    @internal
 */
 class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakComponentImplHelperBase
     : public ::cppu::OWeakObject
@@ -94,7 +94,6 @@ public:
 
 /** Implementation helper base class for components. Inherits from ::cppu::OWeakAggObject and
     ::com::sun::star::lang::XComponent.
-    @internal
 */
 class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakAggComponentImplHelperBase
     : public ::cppu::OWeakAggObject
@@ -142,7 +141,6 @@ public:
 };
 
 /** WeakComponentImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakComponentImplHelper_query(
     ::com::sun::star::uno::Type const & rType,
@@ -151,14 +149,12 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakComponentImplHelper
     ::cppu::WeakComponentImplHelperBase * pBase )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** WeakComponentImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakComponentImplHelper_getTypes(
     class_data * cd )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 
 /** WeakAggComponentImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakAggComponentImplHelper_queryAgg(
     ::com::sun::star::uno::Type const & rType,
@@ -167,7 +163,6 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakAggComponentImplHel
     ::cppu::WeakAggComponentImplHelperBase * pBase )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** WeakAggComponentImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakAggComponentImplHelper_getTypes(
     class_data * cd )
@@ -175,6 +170,8 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Typ
 
 }
 
+/// @endcond
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx
index 255a802e3c6e..ccbddc0e0aae 100644
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ b/cppuhelper/inc/cppuhelper/component.hxx
@@ -106,12 +106,12 @@ protected:
     */
     virtual void SAL_CALL disposing();
 
-    /** @internal */
+    /// @cond INTERNAL
     OBroadcastHelper    rBHelper;
+    /// @endcond
+
 private:
-    /** @internal */
     inline OComponentHelper( const OComponentHelper & ) SAL_THROW( () );
-    /** @internal */
     inline OComponentHelper & operator = ( const OComponentHelper & ) SAL_THROW( () );
 };
 
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index 26427d6b1b63..2653908c9ba2 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -88,7 +88,7 @@ typedef const sal_Char * (SAL_CALL * component_getDescriptionFunc)(void);
 
 /** Function pointer declaration.
 
-    @obsolete component_writeInfo should no longer be used in new components
+    @deprecated component_writeInfo should no longer be used in new components
 
     Function writes component registry info, at least writing the supported service names.
 
diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx
index 09ae9e2f76d3..f7fe3a228853 100644
--- a/cppuhelper/inc/cppuhelper/implbase.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase.hxx
@@ -41,12 +41,13 @@
    @deprecated
 */
 
+/// @cond INTERNAL
+
 namespace cppu
 {
 
 /** Struct used for inline template implementation helpers: type entries.
     Not for public use.
-    @internal
 */
 struct Type_Offset
 {
@@ -59,7 +60,6 @@ struct Type_Offset
 };
 /** Struct used for inline template implementation helpers: class data of implementation.
     Not for public use.
-    @internal
 */
 struct CPPUHELPER_DLLPUBLIC ClassDataBase
 {
@@ -104,7 +104,6 @@ struct CPPUHELPER_DLLPUBLIC ClassDataBase
     is binary compatible with this one to be casted and used uniform. The size of the varying array
     is set in ClassDataBase::nType2Offset (base class).
     Not for public use.
-    @internal
 */
 struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase
 {
@@ -148,7 +147,6 @@ struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase
 
 /** Shared mutex for implementation helper initialization.
     Not for public use.
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () );
 }
@@ -171,8 +169,6 @@ CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_TH
     __DEF_IMPLHELPER_PRE( N )
     __IFC_WRITEOFFSET( 1 ) __IFC_WRITEOFFSET( 2 ) __IFC_WRITEOFFSET( 3 ), ... up to N
     __DEF_IMPLHELPER_POST( N )
-
-    @internal
 */
 #define __DEF_IMPLHELPER_PRE( N ) \
 namespace cppu \
@@ -200,13 +196,11 @@ protected: \
             { \
                 char * pBase = (char *)this;
 /** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-    @internal
 */
 #define __IFC_WRITEOFFSET( N ) \
                 rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< Ifc##N > *)0 ), \
                                      (char *)(Ifc##N *)this - pBase );
 /** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-    @internal
 */
 #define __DEF_IMPLHELPER_POST_A( N ) \
                 rCD.bOffsetsInit = sal_True; \
@@ -274,7 +268,6 @@ public: \
 };
 
 /** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-    @internal
 */
 #define __DEF_IMPLHELPER_POST_B( N ) \
 template< __CLASS_IFC##N > \
@@ -284,18 +277,19 @@ ClassData##N WeakImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 1 ); \
 template< __CLASS_IFC##N > \
 ClassData##N WeakAggImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 2 );
 /** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-    @internal
 */
 #define __DEF_IMPLHELPER_POST_C( N ) \
 }
 //==================================================================================================
 /** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-    @internal
 */
 #define __DEF_IMPLHELPER_POST( N ) \
 __DEF_IMPLHELPER_POST_A( N ) \
 __DEF_IMPLHELPER_POST_B( N ) \
 __DEF_IMPLHELPER_POST_C( N )
+
+/// @endcond
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx
index 6974c4c57507..940e453b7d28 100644
--- a/cppuhelper/inc/cppuhelper/implbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase1.hxx
@@ -34,7 +34,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data1
     {
         sal_Int16 m_nTypes;
@@ -44,7 +45,6 @@ namespace cppu
         type_entry m_typeEntries[ 1 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Impl > struct ImplClassData1
     {
         class_data* operator ()()
@@ -55,14 +55,16 @@ namespace cppu
                 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
                 {
                     { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -72,21 +74,21 @@ namespace cppu
     */
     template< class Ifc1 >
     class SAL_NO_VTABLE ImplHelper1
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1 < Ifc1, ImplHelper1<Ifc1> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -99,28 +101,27 @@ namespace cppu
     template< class Ifc1 >
     class SAL_NO_VTABLE WeakImplHelper1
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakImplHelper1< Ifc1 > > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -132,34 +133,33 @@ namespace cppu
     template< class Ifc1 >
     class SAL_NO_VTABLE WeakAggImplHelper1
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggImplHelper1< Ifc1 > > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -172,7 +172,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, ImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
     protected:
 #if (defined __SUNPRO_CC && __SUNPRO_CC <= 0x550)
@@ -208,9 +207,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper1() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -219,20 +218,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -246,7 +245,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, AggImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
     protected:
         template< typename T1 >
@@ -277,11 +275,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper1() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -290,9 +288,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase10.hxx b/cppuhelper/inc/cppuhelper/implbase10.hxx
index 972de4544fe9..090a5d38de28 100644
--- a/cppuhelper/inc/cppuhelper/implbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase10.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data10
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 10 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl >
     struct ImplClassData10
     {
@@ -64,14 +64,16 @@ namespace cppu
                     { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *) 16) - 16 },
                     { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *) 16) - 16 },
                     { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -81,22 +83,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
     class SAL_NO_VTABLE ImplHelper10
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, ImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -105,28 +106,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
     class SAL_NO_VTABLE WeakImplHelper10
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -138,34 +138,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
     class SAL_NO_VTABLE WeakAggImplHelper10
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -178,7 +177,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, ImplInheritanceHelper10<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     protected:
         template< typename T1 >
@@ -209,9 +207,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper10() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -220,20 +218,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -247,7 +245,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, AggImplInheritanceHelper10<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     protected:
         template< typename T1 >
@@ -278,11 +275,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper10() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -291,9 +288,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase11.hxx b/cppuhelper/inc/cppuhelper/implbase11.hxx
index 49a1149b68fa..28e2f95b01d6 100644
--- a/cppuhelper/inc/cppuhelper/implbase11.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase11.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data11
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 11 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl >
     struct ImplClassData11
     {
@@ -65,14 +65,16 @@ namespace cppu
                     { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *) 16) - 16 },
                     { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *) 16) - 16 },
                     { { Ifc11::static_type }, ((sal_IntPtr)(Ifc11 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -82,22 +84,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
     class SAL_NO_VTABLE ImplHelper11
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, ImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -106,28 +107,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
     class SAL_NO_VTABLE WeakImplHelper11
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -139,34 +139,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
     class SAL_NO_VTABLE WeakAggImplHelper11
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -179,7 +178,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, ImplInheritanceHelper11<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
     protected:
         template< typename T1 >
@@ -210,9 +208,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper11() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -221,20 +219,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -248,7 +246,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, AggImplInheritanceHelper11<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
     protected:
         template< typename T1 >
@@ -279,11 +276,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper11() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -292,9 +289,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/cppuhelper/inc/cppuhelper/implbase12.hxx
index 0005abf07f3d..b4ca625b0177 100644
--- a/cppuhelper/inc/cppuhelper/implbase12.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase12.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data12
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 12 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl >
     struct ImplClassData12
     {
@@ -66,14 +66,16 @@ namespace cppu
                     { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *) 16) - 16 },
                     { { Ifc11::static_type }, ((sal_IntPtr)(Ifc11 *) (Impl *) 16) - 16 },
                     { { Ifc12::static_type }, ((sal_IntPtr)(Ifc12 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -83,22 +85,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
     class SAL_NO_VTABLE ImplHelper12
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, ImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -107,28 +108,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
     class SAL_NO_VTABLE WeakImplHelper12
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -140,34 +140,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
     class SAL_NO_VTABLE WeakAggImplHelper12
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -180,7 +179,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, ImplInheritanceHelper12<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     protected:
         template< typename T1 >
@@ -211,9 +209,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper12() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -222,20 +220,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -249,7 +247,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, AggImplInheritanceHelper12<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     protected:
         template< typename T1 >
@@ -280,11 +277,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper12() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -293,9 +290,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/cppuhelper/inc/cppuhelper/implbase2.hxx
index 99282f6a0a16..72b084ea12ed 100644
--- a/cppuhelper/inc/cppuhelper/implbase2.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase2.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data2
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 2 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Impl > struct ImplClassData2
     {
         class_data* operator ()()
@@ -55,14 +55,16 @@ namespace cppu
                 {
                     { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
                     { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and queryInterface(), but no reference counting.
 
         @derive
@@ -72,22 +74,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2 >
     class SAL_NO_VTABLE ImplHelper2
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, ImplHelper2<Ifc1, Ifc2> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -96,28 +97,27 @@ namespace cppu
     template< class Ifc1, class Ifc2 >
     class SAL_NO_VTABLE WeakImplHelper2
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakImplHelper2<Ifc1, Ifc2> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -129,34 +129,33 @@ namespace cppu
     template< class Ifc1, class Ifc2 >
     class SAL_NO_VTABLE WeakAggImplHelper2
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggImplHelper2<Ifc1, Ifc2> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -169,7 +168,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, ImplInheritanceHelper2<BaseClass, Ifc1, Ifc2> > > {};
     protected:
         template< typename T1 >
@@ -200,9 +198,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper2() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -211,20 +209,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -238,7 +236,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, AggImplInheritanceHelper2<BaseClass, Ifc1, Ifc2> > > {};
     protected:
         template< typename T1 >
@@ -269,11 +266,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper2() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -282,9 +279,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase3.hxx b/cppuhelper/inc/cppuhelper/implbase3.hxx
index 1aad6ce7b940..e5b2e7b9a22b 100644
--- a/cppuhelper/inc/cppuhelper/implbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase3.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data3
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 3 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct ImplClassData3
     {
         class_data* operator ()()
@@ -56,14 +56,16 @@ namespace cppu
                     { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
                     { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 },
                     { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -73,22 +75,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3 >
     class SAL_NO_VTABLE ImplHelper3
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, ImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -97,28 +98,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3 >
     class SAL_NO_VTABLE WeakImplHelper3
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -130,34 +130,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3 >
     class SAL_NO_VTABLE WeakAggImplHelper3
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
         also has to have a default ctor.
@@ -171,7 +170,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, ImplInheritanceHelper3<BaseClass, Ifc1, Ifc2, Ifc3> > > {};
     protected:
         template< typename T1 >
@@ -202,9 +200,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper3() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -213,20 +211,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -240,7 +238,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, AggImplInheritanceHelper3<BaseClass, Ifc1, Ifc2, Ifc3> > > {};
     protected:
         template< typename T1 >
@@ -271,11 +268,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper3() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -284,9 +281,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/cppuhelper/inc/cppuhelper/implbase4.hxx
index ad00b829ee88..7bdd94afd819 100644
--- a/cppuhelper/inc/cppuhelper/implbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase4.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data4
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 4 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl >
         struct ImplClassData4
     {
@@ -58,14 +58,16 @@ namespace cppu
                     { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 },
                     { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 },
                     { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -75,22 +77,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
     class SAL_NO_VTABLE ImplHelper4
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, ImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -99,28 +100,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
     class SAL_NO_VTABLE WeakImplHelper4
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -132,34 +132,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
     class SAL_NO_VTABLE WeakAggImplHelper4
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -172,7 +171,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, ImplInheritanceHelper4<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     protected:
         template< typename T1 >
@@ -203,9 +201,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper4() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -214,20 +212,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -241,7 +239,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, AggImplInheritanceHelper4<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     protected:
         template< typename T1 >
@@ -272,11 +269,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper4() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -285,9 +282,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/cppuhelper/inc/cppuhelper/implbase5.hxx
index 8d4e216e0b00..1c9d9a8fe319 100644
--- a/cppuhelper/inc/cppuhelper/implbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase5.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data5
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 5 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl >
         struct ImplClassData5
     {
@@ -59,14 +59,16 @@ namespace cppu
                     { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 },
                     { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 },
                     { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -76,22 +78,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
     class SAL_NO_VTABLE ImplHelper5
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, ImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -100,28 +101,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
     class SAL_NO_VTABLE WeakImplHelper5
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -133,34 +133,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
     class SAL_NO_VTABLE WeakAggImplHelper5
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -173,7 +172,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, ImplInheritanceHelper5<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     protected:
         template< typename T1 >
@@ -204,9 +202,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper5() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -215,20 +213,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -242,7 +240,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, AggImplInheritanceHelper5<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     protected:
         template< typename T1 >
@@ -273,11 +270,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper5() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -286,9 +283,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase6.hxx b/cppuhelper/inc/cppuhelper/implbase6.hxx
index c545284145e6..d2a7e415ab79 100644
--- a/cppuhelper/inc/cppuhelper/implbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase6.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data6
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 6 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl >
         struct ImplClassData6
     {
@@ -60,14 +60,16 @@ namespace cppu
                     { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 },
                     { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 },
                     { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -77,22 +79,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
     class SAL_NO_VTABLE ImplHelper6
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, ImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -101,28 +102,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
     class SAL_NO_VTABLE WeakImplHelper6
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -134,34 +134,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
     class SAL_NO_VTABLE WeakAggImplHelper6
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -174,7 +173,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, ImplInheritanceHelper6<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     protected:
         template< typename T1 >
@@ -205,9 +203,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper6() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -216,20 +214,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -243,7 +241,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, AggImplInheritanceHelper6<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     protected:
         template< typename T1 >
@@ -274,11 +271,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper6() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -287,9 +284,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/cppuhelper/inc/cppuhelper/implbase7.hxx
index 9a254f40f731..9297249516a5 100644
--- a/cppuhelper/inc/cppuhelper/implbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase7.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data7
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 7 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl >
         struct ImplClassData7
     {
@@ -61,15 +61,16 @@ namespace cppu
                     { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 },
                     { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 },
                     { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
+    /// @endcond
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -79,22 +80,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
     class SAL_NO_VTABLE ImplHelper7
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, ImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -103,28 +103,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
     class SAL_NO_VTABLE WeakImplHelper7
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -136,34 +135,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
     class SAL_NO_VTABLE WeakAggImplHelper7
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -176,7 +174,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, ImplInheritanceHelper7<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     protected:
         template< typename T1 >
@@ -207,9 +204,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper7() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -218,20 +215,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -245,7 +242,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, AggImplInheritanceHelper7<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     protected:
         template< typename T1 >
@@ -276,11 +272,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper7() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -289,9 +285,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase8.hxx b/cppuhelper/inc/cppuhelper/implbase8.hxx
index e817dc388e8a..e2ec4ee9b34a 100644
--- a/cppuhelper/inc/cppuhelper/implbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase8.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data8
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 8 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl >
     struct ImplClassData8
     {
@@ -62,14 +62,16 @@ namespace cppu
                     { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 },
                     { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 },
                     { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /// @endcond
+
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -79,22 +81,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
     class SAL_NO_VTABLE ImplHelper8
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, ImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -103,28 +104,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
     class SAL_NO_VTABLE WeakImplHelper8
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -136,34 +136,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
     class SAL_NO_VTABLE WeakAggImplHelper8
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -176,7 +175,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, ImplInheritanceHelper8<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     protected:
         template< typename T1 >
@@ -207,9 +205,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper8() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -218,20 +216,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -245,7 +243,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, AggImplInheritanceHelper8<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     protected:
         template< typename T1 >
@@ -276,11 +273,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper8() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -289,9 +286,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase9.hxx b/cppuhelper/inc/cppuhelper/implbase9.hxx
index a070c71cab3e..724ca42e8a0a 100644
--- a/cppuhelper/inc/cppuhelper/implbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase9.hxx
@@ -33,7 +33,8 @@
 
 namespace cppu
 {
-    /** @internal */
+    /// @cond INTERNAL
+
     struct class_data9
     {
         sal_Int16 m_nTypes;
@@ -43,7 +44,6 @@ namespace cppu
         type_entry m_typeEntries[ 9 + 1 ];
     };
 
-    /** @internal */
     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl >
     struct ImplClassData9
     {
@@ -63,15 +63,16 @@ namespace cppu
                     { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 },
                     { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *) 16) - 16 },
                     { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *) 16) - 16 },
-                    { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
                 }
             };
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
 
+    /// @endcond
 
-    /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
+    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
 
         @derive
@@ -81,22 +82,21 @@ namespace cppu
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
     class SAL_NO_VTABLE ImplHelper9
-        : public ::com::sun::star::lang::XTypeProvider
+        : public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, ImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
 
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
@@ -105,28 +105,27 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
     class SAL_NO_VTABLE WeakImplHelper9
         : public OWeakObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
+        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
         In addition, it supports also aggregation meaning object of this class can be aggregated
-        (::com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
+        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
@@ -138,34 +137,33 @@ namespace cppu
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
     class SAL_NO_VTABLE WeakAggImplHelper9
         : public OWeakAggObject
-        , public ::com::sun::star::lang::XTypeProvider
+        , public com::sun::star::lang::XTypeProvider
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
         virtual void SAL_CALL acquire() throw ()
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw ()
             { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
         if a demanded interface is not supported by this class directly, the request is
         delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface
-        and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
+        and com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
 
@@ -178,7 +176,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, ImplInheritanceHelper9<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     protected:
         template< typename T1 >
@@ -209,9 +206,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper9() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryInterface( rType );
@@ -220,20 +217,20 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
-    /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
-        ::com::sun::star::uno::XInterface inherting from a BaseClass.
+    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
+        com::sun::star::uno::XInterface inherting from a BaseClass.
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
 
         @attention
-        The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
-        ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
+        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
+        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
@@ -247,7 +244,6 @@ namespace cppu
         : public BaseClass
         , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
     {
-        /** @internal */
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, AggImplInheritanceHelper9<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     protected:
         template< typename T1 >
@@ -278,11 +274,11 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper9() {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             { return BaseClass::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
             {
-                ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
+                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
                     return aRet;
                 return BaseClass::queryAggregation( rType );
@@ -291,9 +287,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw ()
             { BaseClass::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
index 190e400817c2..55bfd28c67e5 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
@@ -48,17 +48,16 @@
 __DEF_IMPLHELPER_EX( 3 )
 */
 
+/// @cond INTERNAL
 
 namespace cppu
 {
 
 /** function pointer signature for getCppuType
-    @internal
 */
 typedef ::com::sun::star::uno::Type const & (SAL_CALL * fptr_getCppuType)( void * ) SAL_THROW( () );
 
 /** single type + object offset
-    @internal
 */
 struct type_entry
 {
@@ -77,7 +76,6 @@ struct type_entry
 };
 
 /** identical dummy struct for casting class_dataN to class_data
-    @internal
 */
 struct class_data
 {
@@ -103,7 +101,6 @@ struct class_data
 };
 
 /** ImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_query(
     ::com::sun::star::uno::Type const & rType,
@@ -111,7 +108,6 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_query(
     void * that )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** ImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInterface(
     ::com::sun::star::uno::Type const & rType,
@@ -119,14 +115,12 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInte
     void * that )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** ImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
 SAL_CALL ImplHelper_getTypes(
     class_data * cd )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** ImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
 SAL_CALL ImplInhHelper_getTypes(
@@ -134,7 +128,6 @@ SAL_CALL ImplInhHelper_getTypes(
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > const & rAddTypes )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** ImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 >
 SAL_CALL ImplHelper_getImplementationId(
@@ -142,7 +135,6 @@ SAL_CALL ImplHelper_getImplementationId(
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 
 /** WeakImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakImplHelper_query(
     ::com::sun::star::uno::Type const & rType,
@@ -151,7 +143,6 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakImplHelper_query(
     ::cppu::OWeakObject * pBase )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** WeakImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
 SAL_CALL WeakImplHelper_getTypes(
@@ -159,7 +150,6 @@ SAL_CALL WeakImplHelper_getTypes(
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 
 /** WeakAggImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any
 SAL_CALL WeakAggImplHelper_queryAgg(
@@ -169,7 +159,6 @@ SAL_CALL WeakAggImplHelper_queryAgg(
     ::cppu::OWeakAggObject * pBase )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** WeakAggImplHelper
-    @internal
 */
 CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
 SAL_CALL WeakAggImplHelper_getTypes(
@@ -178,6 +167,8 @@ SAL_CALL WeakAggImplHelper_getTypes(
 
 }
 
+/// @endcond
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
index 83849e5e6cab..eaa9280918b5 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
@@ -28,8 +28,8 @@
 #ifndef _CPPUHELPER_IMPLBASE_EX_POST_HXX_
 #define _CPPUHELPER_IMPLBASE_EX_POST_HXX_
 
+/// @cond INTERNAL
 
-/** @internal */
 #define __DEF_CLASS_DATA_INIT_EX( N, class_cast ) \
 { \
 N +1, sal_False, sal_False, \
@@ -40,7 +40,6 @@ __IFC_EX_TYPE_INIT_NAME( class_cast, ::com::sun::star::lang::XTypeProvider ) \
 } \
 }
 
-/** @internal */
 #define __DEF_IMPLHELPER_EX( N ) \
 namespace cppu \
 { \
@@ -171,7 +170,6 @@ class_data##N AggImplInheritanceHelper##N< BaseClass, __IFC##N >::s_cd = \
 __DEF_CLASS_DATA_INIT_EX( N, (AggImplInheritanceHelper##N< BaseClass, __IFC##N > *) ); \
 }
 
-/** @internal */
 #define __DEF_COMPIMPLHELPER_EX( N ) \
 namespace cppu \
 { \
@@ -229,6 +227,8 @@ class_data##N WeakAggComponentImplHelper##N< __IFC##N >::s_cd = \
 __DEF_CLASS_DATA_INIT_EX( N, (WeakAggComponentImplHelper##N< __IFC##N > *) ); \
 }
 
+/// @endcond
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
index 337fa1ecdc9a..08d2df77532c 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
@@ -28,12 +28,15 @@
 #ifndef _CPPUHELPER_IMPLBASE_EX_PRE_HXX_
 #define _CPPUHELPER_IMPLBASE_EX_PRE_HXX_
 
-/** @internal */
+/// @cond INTERNAL
+
 #define __IFC_EX_TYPE_INIT_NAME( class_cast, ifc_name ) \
 { { ifc_name::static_type }, ((sal_IntPtr)(ifc_name *) class_cast 16) - 16 }
-/** @internal */
+
 #define __IFC_EX_TYPE_INIT( class_cast, N ) __IFC_EX_TYPE_INIT_NAME( class_cast, Ifc##N )
 
+/// @endcond
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h
index 4f44d73f1c3e..454013c9c282 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -202,8 +202,8 @@ public:
         If a com::sun::star::lang::DisposedException occurs which relates to
         the called listener, then that listener is removed from the container.
 
-        @tpl ListenerT listener type
-        @tpl FuncT unary functor type, let your compiler deduce this for you
+        @tparam ListenerT listener type
+        @tparam FuncT unary functor type, let your compiler deduce this for you
         @param func unary functor object expecting an argument of type
                     ::com::sun::star::uno::Reference<ListenerT>
     */
@@ -218,18 +218,18 @@ public:
         If a com::sun::star::lang::DisposedException occurs which relates to
         the called listener, then that listener is removed from the container.
 
-        @tpl ListenerT UNO event listener type, let your compiler deduce this for you
-        @tpl EventT event type, let your compiler deduce this for you
+        @tparam ListenerT UNO event listener type, let your compiler deduce this for you
+        @tparam EventT event type, let your compiler deduce this for you
         @param NotificationMethod
             Pointer to a method of a ListenerT interface.
         @param Event
             Event to notify to all contained listeners
 
-        @example
-<pre>
-    awt::PaintEvent aEvent( static_cast< ::cppu::OWeakObject* >( this ), ... );
+        Example:
+@code
+    awt::PaintEvent aEvent( static_cast< cppu::OWeakObject* >( this ), ... );
     listeners.notifyEach( &XPaintListener::windowPaint, aEvent );
-</pre>
+@endcode
     */
     template< typename ListenerT, typename EventT >
     inline void notifyEach( void ( SAL_CALL ListenerT::*NotificationMethod )( const EventT& ), const EventT& Event );
diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
index 1438bc35012c..8c8186f69758 100644
--- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
@@ -44,8 +44,6 @@
 #include "sal/types.h"
 #include "cppuhelperdllapi.h"
 
-/// @HTML
-
 namespace com { namespace sun { namespace star {
     namespace beans {
         class XPropertyChangeListener;
diff --git a/cppuhelper/inc/cppuhelper/queryinterface.hxx b/cppuhelper/inc/cppuhelper/queryinterface.hxx
index e67e9f9b9342..4717eacce33c 100644
--- a/cppuhelper/inc/cppuhelper/queryinterface.hxx
+++ b/cppuhelper/inc/cppuhelper/queryinterface.hxx
@@ -39,7 +39,7 @@ namespace cppu
 
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
+    @tparam Interface1 interface type
     @param rType demanded type
     @param p1 interface pointer
     @return acquired interface of demanded type or empty Any
@@ -57,8 +57,8 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -79,9 +79,9 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -105,10 +105,10 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -135,11 +135,11 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
-    @tplparam Interface5 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
+    @tparam Interface5 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -169,12 +169,12 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
-    @tplparam Interface5 interface type
-    @tplparam Interface6 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
+    @tparam Interface5 interface type
+    @tparam Interface6 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -209,13 +209,13 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
-    @tplparam Interface5 interface type
-    @tplparam Interface6 interface type
-    @tplparam Interface7 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
+    @tparam Interface5 interface type
+    @tparam Interface6 interface type
+    @tparam Interface7 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -253,14 +253,14 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
-    @tplparam Interface5 interface type
-    @tplparam Interface6 interface type
-    @tplparam Interface7 interface type
-    @tplparam Interface8 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
+    @tparam Interface5 interface type
+    @tparam Interface6 interface type
+    @tparam Interface7 interface type
+    @tparam Interface8 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -301,15 +301,15 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
-    @tplparam Interface5 interface type
-    @tplparam Interface6 interface type
-    @tplparam Interface7 interface type
-    @tplparam Interface8 interface type
-    @tplparam Interface9 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
+    @tparam Interface5 interface type
+    @tparam Interface6 interface type
+    @tparam Interface7 interface type
+    @tparam Interface8 interface type
+    @tparam Interface9 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -353,16 +353,16 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
-    @tplparam Interface5 interface type
-    @tplparam Interface6 interface type
-    @tplparam Interface7 interface type
-    @tplparam Interface8 interface type
-    @tplparam Interface9 interface type
-    @tplparam Interface10 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
+    @tparam Interface5 interface type
+    @tparam Interface6 interface type
+    @tparam Interface7 interface type
+    @tparam Interface8 interface type
+    @tparam Interface9 interface type
+    @tparam Interface10 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -409,17 +409,17 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
-    @tplparam Interface5 interface type
-    @tplparam Interface6 interface type
-    @tplparam Interface7 interface type
-    @tplparam Interface8 interface type
-    @tplparam Interface9 interface type
-    @tplparam Interface10 interface type
-    @tplparam Interface11 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
+    @tparam Interface5 interface type
+    @tparam Interface6 interface type
+    @tparam Interface7 interface type
+    @tparam Interface8 interface type
+    @tparam Interface9 interface type
+    @tparam Interface10 interface type
+    @tparam Interface11 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
@@ -471,18 +471,18 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 }
 /** Compares demanded type to given template argument types.
 
-    @tplparam Interface1 interface type
-    @tplparam Interface2 interface type
-    @tplparam Interface3 interface type
-    @tplparam Interface4 interface type
-    @tplparam Interface5 interface type
-    @tplparam Interface6 interface type
-    @tplparam Interface7 interface type
-    @tplparam Interface8 interface type
-    @tplparam Interface9 interface type
-    @tplparam Interface10 interface type
-    @tplparam Interface11 interface type
-    @tplparam Interface12 interface type
+    @tparam Interface1 interface type
+    @tparam Interface2 interface type
+    @tparam Interface3 interface type
+    @tparam Interface4 interface type
+    @tparam Interface5 interface type
+    @tparam Interface6 interface type
+    @tparam Interface7 interface type
+    @tparam Interface8 interface type
+    @tparam Interface9 interface type
+    @tparam Interface10 interface type
+    @tparam Interface11 interface type
+    @tparam Interface12 interface type
     @param rType demanded type
     @param p1 interface pointer
     @param p2 interface pointer
diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/cppuhelper/inc/cppuhelper/typeprovider.hxx
index d9971854602f..af813e570d03 100644
--- a/cppuhelper/inc/cppuhelper/typeprovider.hxx
+++ b/cppuhelper/inc/cppuhelper/typeprovider.hxx
@@ -37,7 +37,7 @@
 namespace cppu
 {
 
-/** Helper class to implement ::com::sun::star::lang::XTypeProvider.  Construct a static object
+/** Helper class to implement com::sun::star::lang::XTypeProvider.  Construct a static object
     of this class with your UNO object's supported types.
 */
 class CPPUHELPER_DLLPUBLIC OTypeCollection
@@ -45,19 +45,17 @@ class CPPUHELPER_DLLPUBLIC OTypeCollection
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _aTypes;
 
 public:
+    /// @cond INTERNAL
     // these are here to force memory de/allocation to sal lib.
-    /** @internal */
     inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () )
         { return ::rtl_allocateMemory( nSize ); }
-    /** @internal */
     inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () )
         { ::rtl_freeMemory( pMem ); }
-    /** @internal */
     inline static void * SAL_CALL operator new( size_t, void * pMem ) SAL_THROW( () )
         { return pMem; }
-    /** @internal */
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
+    /// @endcond
 
     inline OTypeCollection( const OTypeCollection & rCollection )
         SAL_THROW( () )
@@ -186,33 +184,31 @@ public:
         { return _aTypes; }
 };
 
-/** Helper class to implement ::com::sun::star::lang::XTypeProvider.  Construct a static object
+/** Helper class to implement com::sun::star::lang::XTypeProvider.  Construct a static object
     of this class for your UNO object's implementation id.
 */
 class CPPUHELPER_DLLPUBLIC OImplementationId
 {
-    /** @internal */
     mutable ::com::sun::star::uno::Sequence< sal_Int8 > * _pSeq;
-    /** @internal */
     sal_Bool _bUseEthernetAddress;
 
 public:
+    /// @cond INTERNAL
+
     // these are here to force memory de/allocation to sal lib.
-    /** @internal */
     inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () )
         { return ::rtl_allocateMemory( nSize ); }
-    /** @internal */
     inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () )
         { ::rtl_freeMemory( pMem ); }
-    /** @internal */
     inline static void * SAL_CALL operator new( size_t, void * pMem ) SAL_THROW( () )
         { return pMem; }
-    /** @internal */
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
 
-    /** @internal */
     ~OImplementationId() SAL_THROW( () );
+
+    /// @endcond
+
     /** Constructor.
 
         @param bUseEthernetAddress whether an ethernet mac address should be taken into account
diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx
index 38ec096d7347..37801e3fe0ef 100644
--- a/cppuhelper/inc/cppuhelper/unourl.hxx
+++ b/cppuhelper/inc/cppuhelper/unourl.hxx
@@ -46,8 +46,6 @@ namespace cppu {
 class CPPUHELPER_DLLPUBLIC UnoUrlDescriptor
 {
 public:
-    /** @internal
-     */
     class Impl;
 
     /** Construct a descriptor from a string representation.
@@ -60,9 +58,9 @@ public:
      */
     explicit UnoUrlDescriptor(rtl::OUString const & rDescriptor);
 
-    /** @internal
-     */
+    /// @cond INTERNAL
     explicit UnoUrlDescriptor(std::auto_ptr< Impl > & rImpl);
+    /// @endcond
 
     UnoUrlDescriptor(UnoUrlDescriptor const & rOther);
 
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index 0775a2570bd5..b8b9ddd1458a 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -39,7 +39,6 @@
 namespace cppu
 {
 
-/** @internal */
 class OWeakConnectionPoint;
 
 /** Base class to implement an UNO object supporting weak references, i.e. the object can be held
@@ -52,7 +51,6 @@ class OWeakConnectionPoint;
 */
 class CPPUHELPER_DLLPUBLIC OWeakObject : public ::com::sun::star::uno::XWeak
 {
-    /** @internal */
     friend class OWeakConnectionPoint;
 
 protected:
@@ -77,30 +75,30 @@ protected:
     */
     oslInterlockedCount m_refCount;
 
+    /// @cond INTERNAL
+
     /** Container of all weak reference listeners and the connection point from the weak reference.
-        @internal
     */
     OWeakConnectionPoint * m_pWeakConnectionPoint;
 
     /** reserved for future use. do not use.
-        @internal
     */
     void * m_pReserved;
 
+    /// @endcond
+
 public:
+    /// @cond INTERNAL
     // these are here to force memory de/allocation to sal lib.
-    /** @internal */
     inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () )
         { return ::rtl_allocateMemory( nSize ); }
-    /** @internal */
     inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () )
         { ::rtl_freeMemory( pMem ); }
-    /** @internal */
     inline static void * SAL_CALL operator new( size_t, void * pMem ) SAL_THROW( () )
         { return pMem; }
-    /** @internal */
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
+    /// @endcond
 
 #ifdef _MSC_VER
     /** Default Constructor.  Sets the reference count to zero.
diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx
index e36367b8bec3..150cfd1b1aa4 100644
--- a/cppuhelper/inc/cppuhelper/weakagg.hxx
+++ b/cppuhelper/inc/cppuhelper/weakagg.hxx
@@ -102,9 +102,7 @@ protected:
     */
     ::com::sun::star::uno::WeakReferenceHelper xDelegator;
 private:
-    /** @internal */
     OWeakAggObject( const OWeakAggObject & rObj ) SAL_THROW( () );
-    /** @internal */
     OWeakAggObject & operator = ( const OWeakAggObject & rObj ) SAL_THROW( () );
 };
 
diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx
index 12a81ee03a4f..1e8362a19b23 100644
--- a/cppuhelper/inc/cppuhelper/weakref.hxx
+++ b/cppuhelper/inc/cppuhelper/weakref.hxx
@@ -41,7 +41,6 @@ namespace star
 namespace uno
 {
 
-/** @internal */
 class OWeakRefListener;
 
 /** The WeakReferenceHelper holds a weak reference to an object. This object must implement
@@ -115,14 +114,15 @@ public:
     void SAL_CALL clear() SAL_THROW( () );
 
 protected:
-    /** @internal */
+    /// @cond INTERNAL
     OWeakRefListener * m_pImpl;
+    /// @endcond
 };
 
 /** The WeakReference<> holds a weak reference to an object. This object must implement
     the ::com::sun::star::uno::XWeak interface.  The implementation is thread safe.
 
-    @tplparam interface_type type of interface
+    @tparam interface_type type of interface
 */
 template< class interface_type >
 class WeakReference : public WeakReferenceHelper
author	Stephan Bergmann <sbergman@redhat.com>	2012-01-05 19:40:38 +0100
committer	Stephan Bergmann <sbergman@redhat.com>	2012-01-05 19:43:14 +0100
commit	58ab12acf576a765ec47cc2753ba57643e51d653 (patch)
tree	79c07bddbdf3e8e6db677eb0b94e8a2880d308c1 /cppuhelper
parent	7482e974117df2bdc737785efdf9eb410787c7b4 (diff)