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).

106 files changed, 1110 insertions, 1376 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index a6d7c84072a9..236a58c1f304 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -61,6 +61,7 @@ export DISABLE_PYTHON="@DISABLE_PYTHON@"
 export DISABLE_STRIP="@DISABLE_STRIP@"
 export DLLTOOL="@DLLTOOL@"
 export DOCDIR="@DOCDIR@"
+export DOXYGEN="@DOXYGEN@"
 export DO_FETCH_TARBALLS="@DO_FETCH_TARBALLS@"
 export DPKG="@DPKG@"
 export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
diff --git a/configure.in b/configure.in
index 2683a329f8a3..8f3b6da50b2f 100644
--- a/configure.in
+++ b/configure.in
@@ -1501,6 +1501,18 @@ AC_ARG_WITH(perl-home,
     ],
 ,)
 
+AC_ARG_WITH(
+    [doxygen],
+    AS_HELP_STRING(
+        [--with-doxygen],
+        [Specifies the doxygen executable to use when generating ODK C/C++
+         documentation. --without-doxygen disables generation of ODK C/C++
+         documentation. Not relevant in the --disable-odk case.])
+    [
+                          Usage:     --with-doxygen=<absolute path to doxygen executable>
+    ],,
+    [with_doxygen=yes])
+
 AC_ARG_WITH(cl-home,
     AS_HELP_STRING([--with-cl-home],
         [For Windows NT users, please supply the path for the Microsoft C/C++
@@ -9888,6 +9900,29 @@ location (/usr/share/java), specify its pathname via
 fi
 AC_SUBST(OOO_JUNIT_JAR)
 
+if test "$enable_odk" = no; then
+    unset DOXYGEN
+else
+    if test "$with_doxygen" = no; then
+        AC_MSG_CHECKING([for doxygen])
+        unset DOXYGEN
+        AC_MSG_RESULT([no])
+    else
+        if test "$with_doxygen" = yes; then
+            AC_PATH_PROG([DOXYGEN], [doxygen])
+            if test -z "$DOXYGEN"; then
+                AC_MSG_RESULT([no])
+                AC_MSG_ERROR([doxygen not found in \$PATH; specify its pathname via --with-doxygen=..., or disable its use via --without-doxygen])
+            fi
+        else
+            AC_MSG_CHECKING([for doxygen])
+            DOXYGEN=$with_doxygen
+            AC_MSG_RESULT([$DOXYGEN])
+        fi
+    fi
+fi
+AC_SUBST([DOXYGEN])
+
 dnl ===================================================================
 dnl Product version
 dnl ===================================================================
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h
index eb29273c16aa..a2fe589682f4 100644
--- a/cppu/inc/com/sun/star/uno/Any.h
+++ b/cppu/inc/com/sun/star/uno/Any.h
@@ -55,19 +55,17 @@ namespace uno
 class Any : public uno_Any
 {
 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
 
     /** Default constructor: Any holds no value; its type is void.
     */
@@ -263,7 +261,7 @@ private:
 
 /** Template function to generically construct an any from a C++ value.
 
-    @tplparam C value type
+    @tparam C value type
     @param value a value
     @return an any
 */
@@ -279,7 +277,7 @@ class Type;
 
 /** Template binary <<= operator to set the value of an any.
 
-    @tplparam C value type
+    @tparam C value type
     @param rAny destination any (left side)
     @param value source value (right side)
 */
@@ -294,7 +292,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
     If the any does not contain a value that can be assigned without data loss, then this
     operation will fail returning false.
 
-    @tplparam C value type
+    @tparam C value type
     @param rAny source any (left side)
     @param value destination value (right side)
     @return true if assignment was possible without data loss
@@ -307,7 +305,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(
     This operator can be implemented as template member function, if all supported compilers
     can cope with template member functions.
 
-    @tplparam C value type
+    @tparam C value type
     @param rAny another any (left side)
     @param value a value (right side)
     @return true if values are equal, false otherwise
@@ -319,7 +317,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_T
     This operator can be implemented as template member function, if all supported compilers
     can cope with template member functions.
 
-    @tplparam C value type
+    @tparam C value type
     @param rAny another any (left side)
     @param value a value (right side)
     @return true if values are unequal, false otherwise
@@ -373,7 +371,8 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type any
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Any * ) SAL_THROW( () )
diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h
index 071cadcfde7b..d3611ac73105 100644
--- a/cppu/inc/com/sun/star/uno/Reference.h
+++ b/cppu/inc/com/sun/star/uno/Reference.h
@@ -164,7 +164,7 @@ enum UnoReference_QueryThrow
     */
     UNO_REF_QUERY_THROW
 };
-/** Enum defining UNO_SET_THROW for throwing if attempts are made to assign a <NULL/>
+/** Enum defining UNO_SET_THROW for throwing if attempts are made to assign a null
     interface
 
     @since UDK 3.2.8
@@ -238,19 +238,17 @@ class Reference : public BaseReference
     }
 
 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
 
     /** Destructor: Releases interface if set.
     */
@@ -517,14 +515,15 @@ public:
     inline static Reference< interface_type > SAL_CALL query( XInterface * pInterface ) SAL_THROW( (RuntimeException) );
 };
 
-/** @internal
-    Enables boost::mem_fn and boost::bind to recognize Reference.
+/// @cond INTERNAL
+/** Enables boost::mem_fn and boost::bind to recognize Reference.
 */
 template <typename T>
 inline T * get_pointer( Reference<T> const& r )
 {
     return r.get();
 }
+/// @endcond
 
 }
 }
diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h
index 68abc9d24748..13a4bf008352 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/cppu/inc/com/sun/star/uno/Sequence.h
@@ -57,41 +57,39 @@ namespace uno
     so the sequence keeps a handle to its data.  To keep value semantics,
     copies are only generated if the sequence is to be modified (new handle).
 
-    @tplparam E element type of sequence
+    @tparam E element type of sequence
 */
 template< class E >
 class Sequence
 {
     /** sequence handle
-        @internal
     */
     uno_Sequence * _pSequence;
 
 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( () )
         {}
 
     /** Static pointer to typelib type of sequence.
         Don't use directly, call getCppuType().
-        @internal
     */
     static typelib_TypeDescriptionReference * s_pType;
 
+    /// @endcond
+
     /** typedefs the element type of the sequence
     */
     typedef E ElementType;
@@ -252,8 +250,9 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @tplparam E element type of sequence
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
+    @tparam E element type of sequence
     @return type of IDL sequence
 */
 template< class E >
@@ -268,7 +267,7 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * )
 
     @attention
     the given element type must be the same as the template argument type!
-    @tplparam E element type of sequence
+    @tparam E element type of sequence
     @param rElementType element type of sequence
     @return type of IDL sequence
 */
@@ -280,7 +279,8 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType )
 /** Gets the meta type of IDL sequence< char >.
     This function has been introduced due to ambiguities with unsigned short.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL sequence< char >
 */
 inline const ::com::sun::star::uno::Type &
diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx
index 8a9b43d1339e..c86c629df7bc 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.hxx
+++ b/cppu/inc/com/sun/star/uno/Sequence.hxx
@@ -45,9 +45,10 @@ namespace star
 namespace uno
 {
 
-//______________________________________________________________________________
+/// @cond INTERNAL
 template< class E >
 typelib_TypeDescriptionReference * Sequence< E >::s_pType = 0;
+/// @endcond
 
 //______________________________________________________________________________
 template< class E >
diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h
index 6490fa4ab7f1..2072d6accc82 100644
--- a/cppu/inc/com/sun/star/uno/Type.h
+++ b/cppu/inc/com/sun/star/uno/Type.h
@@ -66,24 +66,21 @@ enum UnoType_NoAcquire
 class Type
 {
     /** the C typelib reference pointer
-        @internal
     */
     typelib_TypeDescriptionReference * _pType;
 
 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
 
     /** Default Constructor: Type is set to void.
     */
@@ -222,7 +219,8 @@ public:
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type "type"
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () );
@@ -252,7 +250,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THR
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type boolean
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () );
@@ -261,7 +260,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type boolean
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType(
@@ -283,7 +283,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW(
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type byte
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () );
@@ -293,7 +294,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type string
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () );
@@ -303,7 +305,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OU
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type short
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () );
@@ -313,7 +316,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type unsigned short
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () );
@@ -323,7 +327,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt1
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type long
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () );
@@ -333,7 +338,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type unsigned long
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () );
@@ -343,7 +349,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt3
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type hyper
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () );
@@ -353,7 +360,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type unsigned hyper
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () );
@@ -363,7 +371,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt6
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type float
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () );
@@ -373,7 +382,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * )
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
 
-    @param dummy typed pointer for function signature
+    The dummy parameter is just a typed pointer for function signature.
+
     @return type of IDL type double
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () );
diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx
index 5c123e7aecd9..78df3151be8c 100644
--- a/cppu/inc/cppu/macros.hxx
+++ b/cppu/inc/cppu/macros.hxx
@@ -34,6 +34,8 @@
 /** Namespace name for compiler/ platform, e.g. gcc3, msci */
 #define CPPU_CURRENT_NAMESPACE CPPU_ENV
 
+/// @cond INTERNAL
+
 /** Patching the GCC 3 incomatible alignment change for Linux.
 
     This macro is appended by cppumaker to every first member of a struct, if
@@ -42,8 +44,6 @@
     bug in GCC prior to version 3.3, which would cause __alignof__ of such a
     struct to become 8 instead of 4 if CPPU_GCC3_ALIGN were added to its first
     member.)
-
-    @internal
 */
 #if defined(__GNUC__) && (__GNUC__ >= 3)
 #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct))))
@@ -56,12 +56,12 @@
 
    These macros are used in the headers generated by cppumaker for UNO exception
    types, to ensure that exception handling does not fail on GCC.
-
-   @internal
 */
 #define CPPU_GCC_DLLPUBLIC_EXPORT SAL_EXCEPTION_DLLPUBLIC_EXPORT
 #define CPPU_GCC_DLLPRIVATE SAL_EXCEPTION_DLLPRIVATE
 
+/// @endcond
+
 #endif  // _CPPU_MACROS_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/unotype.hxx b/cppu/inc/cppu/unotype.hxx
index b8df4e07a1b0..eedd01d7c7fb 100644
--- a/cppu/inc/cppu/unotype.hxx
+++ b/cppu/inc/cppu/unotype.hxx
@@ -320,6 +320,8 @@ template< typename T > inline ::com::sun::star::uno::Type const &
 getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *);
     // defined in com/sun/star/uno/Sequence.hxx
 
+/// @cond INTERNAL
+
 /**
    A working replacement for getCppuType (see there).
 
@@ -329,8 +331,6 @@ getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *);
    type CHAR but not for the UNO type UNSIGNED SHORT.  Additionally, it also
    returns the intended results for sequence types.
 
-   @internal
-
    @since UDK 3.2.3
 */
 template< typename T > inline ::com::sun::star::uno::Type const &
@@ -347,8 +347,6 @@ getTypeFavourChar(T const *) {
    type CHAR but not for the UNO type UNSIGNED SHORT.  Additionally, it also
    returns the intended results for sequence types.
 
-   @internal
-
    @since UDK 3.2.3
 */
 inline ::com::sun::star::uno::Type const &
@@ -365,14 +363,14 @@ getTypeFavourChar(::sal_Unicode const *) {
    type CHAR but not for the UNO type UNSIGNED SHORT.  Additionally, it also
    returns the intended results for sequence types.
 
-   @internal
-
    @since UDK 3.2.3
 */
 template< typename T > inline ::com::sun::star::uno::Type const &
 getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *);
     // defined in com/sun/star/uno/Sequence.hxx
 
+/// @endcond
+
 }
 
 #endif
diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h
index 333fc1c01dfd..6494e7c15a89 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -407,7 +407,6 @@ typedef struct _typelib_InterfaceAttributeTypeDescription
     typelib_TypeDescriptionReference **         ppSetExceptions;
 } typelib_InterfaceAttributeTypeDescription;
 
-/// @HTML
 /** Type description of an interface.
 
     <p>Not all members are always initialized (not yet initialized members being
@@ -871,12 +870,13 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback(
 /*----------------------------------------------------------------------------*/
 /*----------------------------------------------------------------------------*/
 
+/// @cond INTERNAL
+
 /** Returns true, if the type description reference may lose the type description. Otherwise
     pType is a valid pointer and cannot be discarded through the lifetime of this reference.
     Remark: If the pWeakObj of the type is set too, you can avoid the call of
     ...getDescription(...) and use the description directly. pWeakObj == 0 means, that the
     description is not initialized.
-    @internal
 */
 #define TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass ) \
     ((eTypeClass) == typelib_TypeClass_INTERFACE_METHOD || \
@@ -885,7 +885,6 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback(
 /** Gets a description from the reference. The description may not be locked by this call.
     You must use the TYPELIB_DANGER_RELEASE macro to release the description fetched with
     this macro.
-    @internal
 */
 #define TYPELIB_DANGER_GET( ppDescription, pTypeRef ) \
 { \
@@ -908,7 +907,6 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback(
 }
 
 /** Releases the description previouse fetched by TYPELIB_DANGER_GET.
-    @internal
 */
 #define TYPELIB_DANGER_RELEASE( pDescription ) \
 { \
@@ -916,6 +914,8 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback(
         typelib_typedescription_release( pDescription ); \
 }
 
+/// @endcond
+
 /** Creates a type description reference. This is a weak reference not holding the description.
     If the description is already registered, the previous one is returned.
 
diff --git a/cppu/inc/typelib/typedescription.hxx b/cppu/inc/typelib/typedescription.hxx
index 3997f3d9c14d..2e3e72f5491d 100644
--- a/cppu/inc/typelib/typedescription.hxx
+++ b/cppu/inc/typelib/typedescription.hxx
@@ -55,19 +55,17 @@ class TypeDescription
     mutable typelib_TypeDescription * _pTypeDescr;
 
 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
 
     /** Constructor:
 
diff --git a/cppu/inc/uno/current_context.hxx b/cppu/inc/uno/current_context.hxx
index 01d59a460eca..80a7ad8d56b3 100644
--- a/cppu/inc/uno/current_context.hxx
+++ b/cppu/inc/uno/current_context.hxx
@@ -77,11 +77,9 @@ inline bool SAL_CALL setCurrentContext(
 class ContextLayer
 {
     /** this C++ environment type name.
-        @internal
     */
     ::rtl::OUString m_aEnvTypeName;
     /** previous context
-        @internal
     */
     Reference< XCurrentContext > m_xPreviousContext;
 
diff --git a/cppu/inc/uno/dispatcher.hxx b/cppu/inc/uno/dispatcher.hxx
index 90fdb3db6df7..c6573354729f 100644
--- a/cppu/inc/uno/dispatcher.hxx
+++ b/cppu/inc/uno/dispatcher.hxx
@@ -31,6 +31,7 @@
 
 #include "uno/dispatcher.h"
 
+/// @cond INTERNAL
 
 namespace com
 {
@@ -45,7 +46,7 @@ namespace uno
     subject to changes.
 
     @see uno_Interface
-    @internal
+    @attention
               not for public use!
 */
 class UnoInterfaceReference
@@ -172,6 +173,8 @@ inline void UnoInterfaceReference::dispatch(
 }
 }
 
+/// @endcond
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/environment.hxx b/cppu/inc/uno/environment.hxx
index 8fa4f3ea5063..61b6b7aa275e 100644
--- a/cppu/inc/uno/environment.hxx
+++ b/cppu/inc/uno/environment.hxx
@@ -66,19 +66,17 @@ public:
     */
     inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))) SAL_THROW( () );
 
+    /// @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
 
     /** Constructor: acquires given environment
 
diff --git a/cppu/inc/uno/mapping.hxx b/cppu/inc/uno/mapping.hxx
index a183cf089de3..2e50164d1c14 100644
--- a/cppu/inc/uno/mapping.hxx
+++ b/cppu/inc/uno/mapping.hxx
@@ -60,18 +60,16 @@ class Mapping
 
 public:
     // these are here to force memory de/allocation to sal lib.
-    /** @internal */
+    /// @cond 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
 
     /** Holds a mapping from the specified source to the specified destination by environment
         type names.
@@ -305,7 +303,7 @@ inline void * Mapping::mapInterface(
 
     Maps an binary C UNO interface to be used in the currently used compiler environment.
 
-    @tplparam C interface type
+    @tparam C interface type
     @param ppRet inout returned interface pointer
     @param pUnoI binary C UNO interface
     @return true if successful, false otherwise
@@ -328,7 +326,7 @@ inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_TH
 
     Maps an UNO interface of the currently used compiler environment to binary C UNO.
 
-    @tplparam C interface type
+    @tparam C interface type
     @param ppRet inout returned interface pointer
     @param x interface reference
     @return true if successful, false otherwise
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
diff --git a/odk/docs/cpp/ref/cpp.css b/odk/docs/cpp/ref/cpp.css
deleted file mode 100644
index 0d279b9bc9b5..000000000000
--- a/odk/docs/cpp/ref/cpp.css
+++ /dev/null
@@ -1,127 +0,0 @@
-/*      Autodoc css file for C++ documentation      */
-
-
-body   { background-color:#ffffff; }
-
-#adc-cppref a { color: #000000;	text-decoration: none; }
-#adc-cppref a:link { color: #18A303;	text-decoration: none; }
-#adc-cppref a:hover { text-decoration: underline; }
-#adc-cppref a:visited { color: #106802; }
-
-#adc-cppref h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }
-#adc-cppref h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }
-#adc-cppref h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }
-#adc-cppref h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
-#adc-cppref dl     { margin-top:1pt; margin-bottom:1pt; }
-#adc-cppref dl.member  { margin-top:1pt; margin-bottom:1pt; 
-	     background-color:#c2f6ba; }
-#adc-cppref dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
-#adc-cppref dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
-#adc-cppref dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }
-#adc-cppref dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }
-#adc-cppref dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }
-#adc-cppref p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }
-#adc-cppref pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }
-#adc-cppref tr     { font-size:10pt; }
-#adc-cppref td     { font-size:10pt; }
-
-#adc-cppref dt.attention   { color:#ff0000; }
-
-#adc-cppref div.title      { text-align:center;  line-height:26pt; 
-		 background-color:#18a303; }
-#adc-cppref .subtitle      {background-color:#18a303; }
-
-#adc-cppref td.flagname    { background-color:#c2f6ba;
-	         font-family:Arial; font-size:8pt; font-weight:bold; }
-#adc-cppref td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }
-#adc-cppref td.flagno      { font-family:Arial; font-size:8pt; }
-#adc-cppref td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }
-
-#adc-cppref td.navimain
-               { background-color:#c2f6ba;
-                 font-family:Arial; font-size:12pt; font-weight:bold; }
-                 
-/* background-color:#eeeeff; color:#000000; */
-
-#adc-cppref td.navimainself
-               { background-color:#106802; color:#ffffff;
-                 font-family:Arial; font-size:12pt; font-weight:bold; }
-#adc-cppref td.navimainnone
-               {background-color:#c2f6ba; 
-                 font-family:Arial; font-size:12pt; }
-
-#adc-cppref div.define     { font-family:Arial; background-color:#c2f6ba; }
-
-#adc-cppref .nqclass       { color:#008800; }
-
-#adc-cppref h3.help        { background-color:#c2f6ba; margin-top:12pt; }
-
-#adc-cppref .btpubl        { color:#c2f6ba; }
-#adc-cppref .btprot        { color:#18a303; }
-#adc-cppref .btpriv        { color:#00ff00; }
-#adc-cppref .btvpubl       { color:#87c2e6; font-style:italic; }
-#adc-cppref .btvprot       { color:#18a303; font-style:italic; }
-#adc-cppref .btvpriv       { color:#00ff00; font-style:italic; }
-#adc-cppref .btself        { font-weight:bold; }
-
-#adc-cppref table { empty-cells:show; }
-
-#adc-cppref .childlist td, 
-#adc-cppref .commentedlinks td, 
-#adc-cppref .memberlist td, 
-#adc-cppref .title-table td, 
-#adc-cppref .subtitle td, 
-#adc-cppref .crosstitle td  { border: .1pt solid grey }
-
-#adc-cppref .flag-table td { border: .1pt solid #cccccc; } 
-
-#adc-cppref .table-in-method td, 
-#adc-cppref .table-in-data td, 
-#adc-cppref .navimain td, 
-#adc-cppref .navisub td, 
-#adc-cppref .expl-table td, 
-#adc-cppref .param-table td  { border: none; }
-
-
-/* Explanation of CSS classes:
-
-dl.member       provides coloured frame for function descriptions.
-dd.member       makes the content of this frame white
-
-dt.attention    special colour for @attention remarks
-
-div.title       HTML page headline
-.subtitle       headline of lists of members and similar
-
-                These are for the flagtables in classes:
-td.flagname     Flag name.
-td.flagyes      flag value "yes"
-td.flagno       flag value "no"
-td.flagtext     other flag value
-
-
-                These are for the main navigationbar:
-td.navimain, td.navimain a
-                Links in navibar.
-td.navimainself Text in navibar which refers to current page.
-td.navimainnone Text which links to nothing.
-
-
-div.define      Subtitles on the #define/macro descriptions page
-
-.nqclass        special color for classes in the qualification
-                on top of type pages like in:
-                ::nsp1::nsp2::_ClassXY_::
-
-h3.help         Subtitles on the help page
-
-                These are for the base class tree on class pages:
-.btpubl         public base class
-.btprot         protected
-.btpriv         private
-.btvpubl        virtual public
-.btvprot        virtual protected
-.btvpriv        virtual private
-.btself         placeholder for currently displayed class
-
-*/
diff --git a/odk/index.html b/odk/index.html
index f1baa8a40b83..de905cda3010 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -106,7 +106,7 @@
               </tr>
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
-                <td colspan="2"><a href="docs/cpp/ref/names/index.html" title="link to the C++ API reference documentation">C++ Reference</a></td>
+                <td colspan="2"><a href="docs/cpp/ref/index.html" title="link to the C++ API reference documentation">C++ Reference</a></td>
                 <td class="content70">Reference documentation of the C++ UNO runtime and a 
 				set of C/C++ base and helper functions and classes to abstract from
 				the system layer.</td>
diff --git a/odk/pack/gendocu/Doxyfile b/odk/pack/gendocu/Doxyfile
new file mode 100644
index 000000000000..897462757723
--- /dev/null
+++ b/odk/pack/gendocu/Doxyfile
@@ -0,0 +1,51 @@
+##
+## Version: MPL 1.1 / GPLv3+ / LGPLv3+
+##
+## The contents of this file are subject to the Mozilla Public License Version
+## 1.1 (the "License"); you may not use this file except in compliance with
+## the License or as specified alternatively below. You may obtain a copy of
+## the License at http://www.mozilla.org/MPL/
+##
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+## for the specific language governing rights and limitations under the
+## License.
+##
+## Major Contributor(s):
+## [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+##   (initial developer) ]
+##
+## All Rights Reserved.
+##
+## For minor contributions see the git repository.
+##
+## Alternatively, the contents of this file may be used under the terms of
+## either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+## the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+## in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+## instead of those above.
+##
+
+PROJECT_BRIEF = %
+OUTPUT_DIRECTORY = %
+STRIP_FROM_PATH = %
+JAVADOC_AUTOBRIEF = YES
+
+EXTRACT_ALL = YES
+CASE_SENSE_NAMES = NO
+
+QUIET = %
+WARNINGS = YES
+WARN_IF_DOC_ERROR = YES
+WARN_FORMAT = "$file:$line: $text"
+
+INPUT = %
+RECURSIVE = YES
+
+HTML_OUTPUT = .
+
+GENERATE_LATEX = NO
+
+MACRO_EXPANSION = YES
+EXPAND_ONLY_PREDEF = YES
+PREDEFINED = __cplusplus SAL_CALL= "SAL_THROW(x)=throw x"
diff --git a/odk/pack/gendocu/main.dox b/odk/pack/gendocu/main.dox
new file mode 100644
index 000000000000..718f639f9d90
--- /dev/null
+++ b/odk/pack/gendocu/main.dox
@@ -0,0 +1,31 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ *   (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+/// \mainpage
+///
+/// This is a reference documentation for the C++ source code.
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index fc9abf1881b8..93bd1aeb6509 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -68,38 +68,40 @@ JAVA_BEAN_SRC_FILES=\
         $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
         $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
 
-AUTODOCPARAMS= -lg c++ \
-        -p sal $(INCOUT) -t sal -t osl -t rtl \
-        -p store $(INCOUT) -t store \
-        -p registry $(INCOUT) -t registry \
-        -p cppu $(INCOUT) -t cppu -t com -t typelib -t uno \
-        -p cppuhelper $(INCOUT) -t cppuhelper \
-        -p salhelper $(INCOUT) -t salhelper \
-        -p bridges $(INCOUT) -t bridges
-
 JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
 
 JAVADOCLOG = $(MISC)$/javadoc_log.txt
 
-.IF "$(SOLAR_JAVA)"!=""
-all: \
-    $(CPP_DOCU_INDEX_FILE) \
-    $(JAVA_DOCU_INDEX_FILE)
+all :
 
-.ELSE
-all: $(CPP_DOCU_INDEX_FILE)
-.ENDIF
+.IF "$(DOXYGEN)" != ""
+all : $(CPP_DOCU_INDEX_FILE)
+.END
 
+.IF "$(SOLAR_JAVA)" != ""
+all : $(JAVA_DOCU_INDEX_FILE)
+.END
 
-$(CPP_DOCU_CLEANUP_FLAG) : $(INCLUDELIST) $(PRJ)$/docs$/cpp$/ref$/cpp.css
+$(CPP_DOCU_CLEANUP_FLAG) : $(INCLUDELIST) Doxyfile main.dox
     @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENCPPREF)
     $(TOUCH) $@
 
-$(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG)
-    -$(MKDIRHIER) $(@:d)        
-    $(MY_AUTODOC) -html $(DESTDIRGENCPPREF) -name $(CPPDOCREFNAME) $(AUTODOCPARAMS)
-    -rm $(@:d:d)$/cpp.css
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
+.IF "$(VERBOSE)" == "TRUE"
+MY_QUIET = NO
+.ELSE
+MY_QUIET = YES
+.END
+
+$(CPP_DOCU_INDEX_FILE) .ERRREMOVE : $(CPP_DOCU_CLEANUP_FLAG)
+    -$(MKDIRHIER) $(@:d)
+    $(SED) \
+        -e 's!^INPUT = %$$!INPUT = main.dox $(INCLUDETOPDIRLIST) $(INCLUDEFILELIST)!' \
+        -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DESTDIRGENCPPREF)!' \
+        -e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = $(CPPDOCREFNAME)!' \
+        -e 's!^QUIET = %$$!QUIET = $(MY_QUIET)!' \
+        -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(SOLARINCDIR)!' \
+        Doxyfile > $(MISC)/Doxyfile
+    $(DOXYGEN) $(MISC)/Doxyfile
 
 $(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f)
     -$(MKDIRHIER) $(@:d)        
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 6598291754f3..7811635067e1 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -174,133 +174,18 @@ if (-d "$StartDir") {
 
     #check cpp docu, it is only a first and simple check
     # improvement required
-    print "check cpp docu: ";
-    if (-d "$StartDir/docs/cpp/ref") {
-    if (! -e "$StartDir/docs/cpp/ref/index.html") {
-        print "\nERROR: \"$StartDir/docs/cpp/ref/index.html\" is missing\n";
-        $return++;
-    }
-    if (! -d "$StartDir/docs/cpp/ref/index-files") {
-        print "\nERROR: \"$StartDir/docs/cpp/ref/index-files\" is missing\n";
-        $return++;
-    }
-    if (! -e "$StartDir/docs/cpp/ref/index-files/index-10.html") {
-        print "\nERROR: \"$StartDir/docs/cpp/ref/index-files/index-10.html\" is missing\n";
-        $return++;
-    }
-
-    # The commented out types from cppuhelper are missed by autodoc due to
-    # CPPUHELPER_DLLPUBLIC annotations:
-    my @dir_list = ( "com","com/sun","com/sun/star","com/sun/star/uno",
-             "com/sun/star/uno/Any","com/sun/star/uno/Type",
-             "com/sun/star/uno/Array",#"com/sun/star/uno/WeakReferenceHelper",
-             "com/sun/star/uno/Reference","com/sun/star/uno/WeakReference",
-             "com/sun/star/uno/Environment","com/sun/star/uno/Sequence",
-             "com/sun/star/uno/BaseReference","com/sun/star/uno/Mapping",
-             "com/sun/star/uno/ContextLayer","com/sun/star/uno/TypeDescription",
-             "osl","osl/File","osl/Pipe","osl/FileStatus","osl/FileBase",
-             "osl/Guard","osl/Mutex","osl/VolumeInfo","osl/GetGlobalMutex",
-             "osl/Security","osl/Profile","osl/DatagramSocket","osl/SocketAddr",
-             "osl/StreamPipe","osl/ResettableGuard","osl/AcceptorSocket",
-             "osl/ClearableGuard","osl/VolumeDevice","rtl","rtl/Uri","rtl/math",
-             "rtl/OUStringHash","rtl/MalformedUriException","rtl/OUStringBuffer",
-             "rtl/OUString","rtl/Reference","rtl/ByteSequence","rtl/OLocale",
-             "rtl/Logfile","rtl/OString","rtl/IReference","rtl/OStringBuffer",
-             "rtl/OStringHash","_typelib_CompoundTypeDescription","cppu",
-             "cppu/ContextEntry_Init","cppu/ImplInheritanceHelper10",
-             "cppu/ImplInheritanceHelper11","cppu/ImplInheritanceHelper12",
-             "cppu/WeakAggImplHelper1","cppu/WeakAggImplHelper2",
-             "cppu/WeakAggImplHelper3","cppu/WeakAggImplHelper4",
-             "cppu/WeakAggImplHelper5","cppu/WeakAggImplHelper6",
-             "cppu/WeakAggImplHelper7","cppu/WeakAggImplHelper8",
-             "cppu/WeakAggImplHelper9",
-             #"cppu/OMultiTypeInterfaceContainerHelperInt32","cppu/AccessControl",
-             #"cppu/OPropertyArrayHelper",
-             "cppu/ImplHelper1","cppu/ImplHelper2",
-             "cppu/ImplHelper3","cppu/ImplHelper4","cppu/ImplHelper5",
-             "cppu/ImplHelper6","cppu/ImplHelper7","cppu/ImplHelper8",
-             "cppu/ImplHelper9","cppu/WeakComponentImplHelper10",
-             "cppu/WeakComponentImplHelper11","cppu/WeakComponentImplHelper12",
-             #"cppu/UnoUrl",
-             "cppu/WeakComponentImplHelper1",
-             "cppu/WeakComponentImplHelper2","cppu/WeakComponentImplHelper3",
-             "cppu/WeakComponentImplHelper4","cppu/WeakComponentImplHelper5",
-             "cppu/WeakComponentImplHelper6","cppu/WeakComponentImplHelper7",
-             "cppu/WeakComponentImplHelper8","cppu/WeakComponentImplHelper9",
-             #"cppu/OInterfaceIteratorHelper",
-             #"cppu/OMultiTypeInterfaceContainerHelper","cppu/UnoUrlDescriptor",
-             #"cppu/IPropertyArrayHelper",
-             "cppu/OBroadcastHelperVar",
-             #"cppu/OComponentHelper","cppu/OWeakAggObject",
-             "cppu/ImplementationEntry","cppu/WeakImplHelper10",
-             "cppu/WeakImplHelper11","cppu/WeakImplHelper12",
-             #"cppu/OPropertySetHelper",
-             "cppu/ImplHelper10","cppu/ImplHelper11",
-             "cppu/ImplHelper12","cppu/WeakAggImplHelper10",
-             "cppu/WeakAggImplHelper11","cppu/WeakAggImplHelper12",
-             "cppu/ImplInheritanceHelper1","cppu/ImplInheritanceHelper2",
-             "cppu/ImplInheritanceHelper3","cppu/ImplInheritanceHelper4",
-             "cppu/ImplInheritanceHelper5","cppu/ImplInheritanceHelper6",
-             "cppu/ImplInheritanceHelper7","cppu/ImplInheritanceHelper8",
-             "cppu/ImplInheritanceHelper9",#"cppu/OTypeCollection",
-             "cppu/WeakAggComponentImplHelper10",
-             "cppu/WeakAggComponentImplHelper11",
-             "cppu/WeakAggComponentImplHelper12",
-             "cppu/WeakAggComponentImplHelper1",
-             "cppu/WeakAggComponentImplHelper2",
-             "cppu/WeakAggComponentImplHelper3",
-             "cppu/WeakAggComponentImplHelper4",
-             "cppu/WeakAggComponentImplHelper5",
-             "cppu/WeakAggComponentImplHelper6",
-             "cppu/WeakAggComponentImplHelper7",
-             "cppu/WeakAggComponentImplHelper8",
-             "cppu/WeakAggComponentImplHelper9",
-             "cppu/OMultiTypeInterfaceContainerHelperVar",
-             #"cppu/OInterfaceContainerHelper","cppu/OImplementationId",
-             "cppu/AggImplInheritanceHelper1","cppu/AggImplInheritanceHelper2",
-             "cppu/AggImplInheritanceHelper3","cppu/AggImplInheritanceHelper4",
-             "cppu/AggImplInheritanceHelper5","cppu/AggImplInheritanceHelper6",
-             "cppu/AggImplInheritanceHelper7","cppu/AggImplInheritanceHelper8",
-             "cppu/AggImplInheritanceHelper9","cppu/AggImplInheritanceHelper10",
-             "cppu/AggImplInheritanceHelper11","cppu/AggImplInheritanceHelper12",
-             "cppu/WeakImplHelper1","cppu/WeakImplHelper2","cppu/WeakImplHelper3",
-             "cppu/WeakImplHelper4","cppu/WeakImplHelper5","cppu/WeakImplHelper6",
-             "cppu/WeakImplHelper7","cppu/WeakImplHelper8","cppu/WeakImplHelper9",
-             #"cppu/OWeakObject",
-             "__store_FindData","_rtl_StandardModuleCount",
-             "RTUik","RTConstValue","_typelib_TypeDescriptionReference",
-             "_typelib_InterfaceMethodTypeDescription","store","RegistryKey",
-             "_typelib_Union_Init","_sal_Sequence","_typelib_Parameter_Init",
-             "_typelib_TypeDescription","_uno_Environment",
-             "_typelib_InterfaceAttributeTypeDescription",
-             "_rtl_ModuleCount","_uno_ExtEnvironment",
-             "_typelib_IndirectTypeDescription",
-             "Registry_Api","_oslFileStatus",
-             "_typelib_InterfaceMemberTypeDescription","RegistryValueList",
-             "RegistryTypeWriter_Api","_rtl_TextEncodingInfo",
-             "namespace_anonymous_1",
-             "_oslVolumeInfo","_uno_Interface",
-             "_typelib_InterfaceTypeDescription","_uno_Mapping","Registry",
-             "RegistryTypeReader_Api","_typelib_Uik",
-             "_typelib_ArrayTypeDescription",
-             "RegistryKeyArray","RegistryTypeReader","RegistryKeyNames",
-             "RTConstValueUnion","_typelib_UnionTypeDescription","_uno_Any",
-             "RegistryTypeWriter","_rtl_Locale","_typelib_CompoundMember_Init",
-             "_typelib_EnumTypeDescription","_typelib_MethodParameter");
-
-    foreach $i (@dir_list)
-    {
-        if (! -d "$StartDir/docs/cpp/ref/names/$i") {
-        $return++;
-        print "\nERROR: \"$StartDir/docs/cpp/ref/names/$i\" is missing\n";
+    if ($ENV{'DOXYGEN'} ne '') {
+        print "check cpp docu: ";
+        if (-d "$StartDir/docs/cpp/ref") {
+            if (! -e "$StartDir/docs/cpp/ref/index.html") {
+                print "\nERROR: \"$StartDir/docs/cpp/ref/index.html\" is missing\n";
+                $return++;
+            }
         } else {
-        print "+";
+            $return++;
         }
+        print "\n";
     }
-    } else {
-    $return++;
-    }
-    print "\n";
 
     #check java docu, it is only a first and simple check
     # improvement required
diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h
index 9244735c7aa7..e455d0a1bfcd 100644
--- a/registry/inc/registry/reader.h
+++ b/registry/inc/registry/reader.h
@@ -39,8 +39,6 @@
 extern "C" {
 #endif
 
-/// @HTML
-
 /**
    Creates a type reader working on a binary blob that represents a UNOIDL type.
 
diff --git a/registry/inc/registry/reader.hxx b/registry/inc/registry/reader.hxx
index cbb0c68f8d30..b3f464c377d9 100644
--- a/registry/inc/registry/reader.hxx
+++ b/registry/inc/registry/reader.hxx
@@ -42,8 +42,6 @@
 
 namespace typereg {
 
-/// @HTML
-
 /**
    A type reader working on a binary blob that represents a UNOIDL type.
 
diff --git a/registry/inc/registry/registry.hxx b/registry/inc/registry/registry.hxx
index 37f8aa401a7d..8845fbdc077b 100644
--- a/registry/inc/registry/registry.hxx
+++ b/registry/inc/registry/registry.hxx
@@ -652,27 +652,26 @@ public:
 
     friend class Registry;
 public:
+    /// @cond INTERNAL
+
     /** Constructor, which initialize a RegistryKey with registry and an valid key handle.
 
         This constructor is internal only.
-        @internal
     */
     inline RegistryKey(Registry&    registry,
                        RegKeyHandle hKey);
 
     /** returns the internal key handle.
-
-        @internal
      */
     RegKeyHandle getKeyHandle() const { return m_hImpl; }
 
 protected:
     /** sets the internal registry on which this key should work.
-
-        @internal
      */
     inline void setRegistry(Registry& registry);
 
+    /// @endcond
+
     /// stores the registry on which this key works
     Registry        m_registry;
     /// stores the current key handle of this key
@@ -787,6 +786,7 @@ inline RegistryKey::RegistryKey()
     : m_hImpl(NULL)
     { }
 
+/// @cond INTERNAL
 inline RegistryKey::RegistryKey(Registry& registry, RegKeyHandle hKey)
     : m_registry(registry)
     , m_hImpl(hKey)
@@ -794,6 +794,7 @@ inline RegistryKey::RegistryKey(Registry& registry, RegKeyHandle hKey)
         if (m_hImpl)
             m_registry.m_pApi->acquireKey(m_hImpl);
     }
+/// @endcond
 
 inline RegistryKey::RegistryKey(const RegistryKey& toCopy)
     : m_registry(toCopy.m_registry)
@@ -803,10 +804,12 @@ inline RegistryKey::RegistryKey(const RegistryKey& toCopy)
             m_registry.m_pApi->acquireKey(m_hImpl);
     }
 
+/// @cond INTERNAL
 inline void RegistryKey::setRegistry(Registry& registry)
     {
         m_registry = registry;
     }
+/// @endcond
 
 inline RegistryKey::~RegistryKey()
     {
diff --git a/registry/inc/registry/types.h b/registry/inc/registry/types.h
index 44ccda8abad6..cee37bb24001 100644
--- a/registry/inc/registry/types.h
+++ b/registry/inc/registry/types.h
@@ -100,6 +100,7 @@ enum RTTypeClass {
      */
     RT_TYPE_UNION,
 
+    /// @cond INTERNAL
     /**
        Flag for published entities.
 
@@ -111,11 +112,10 @@ enum RTTypeClass {
        addition changes the underlying type of this enumeration for any C/C++
        compiler.)
 
-       @internal
-
        @since UDK 3.2.0
      */
     RT_TYPE_PUBLISHED = 0x4000
+    /// @endcond
 };
 
 /** specifies the type for the field access.
diff --git a/registry/inc/registry/version.h b/registry/inc/registry/version.h
index bf4664287d0f..9f06d3778bed 100644
--- a/registry/inc/registry/version.h
+++ b/registry/inc/registry/version.h
@@ -35,8 +35,6 @@
 extern "C" {
 #endif
 
-/// @HTML
-
 /**
    The version of a binary blob that represents a UNOIDL type.
 
diff --git a/registry/inc/registry/writer.h b/registry/inc/registry/writer.h
index 57a9f81c9684..0adaa1aa918b 100644
--- a/registry/inc/registry/writer.h
+++ b/registry/inc/registry/writer.h
@@ -39,8 +39,6 @@
 extern "C" {
 #endif
 
-/// @HTML
-
 /**
    Creates a type writer working on a binary blob that represents a UNOIDL type.
 
diff --git a/registry/inc/registry/writer.hxx b/registry/inc/registry/writer.hxx
index ce7433c31129..248efef79cc5 100644
--- a/registry/inc/registry/writer.hxx
+++ b/registry/inc/registry/writer.hxx
@@ -41,8 +41,6 @@
 
 namespace typereg {
 
-/// @HTML
-
 /**
    A type writer working on a binary blob that represents a UNOIDL type.
 
@@ -135,9 +133,7 @@ public:
 
        @param typeName the type name of the field
 
-       @param valueType the type of the value of the field
-
-       @param valueValue the value of the value of the field
+       @param value the value of the field
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
@@ -244,8 +240,6 @@ public:
     /**
        Sets the data of a reference of this type writer.
 
-       @param handle a handle on a type writer
-
        @param index a valid index into the range of references of this type
        writer
 
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index dad4669b5dce..9a6112be0788 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -121,13 +121,13 @@ typedef void (SAL_CALL *pfunc_osl_printDetailedDebugMessage)( const sal_Char * p
     The function set here is ignored if a function for detailed message information
     (pfunc_osl_printDetailedDebugMessage) has been set.
 
-    The given message handler must be able to cope with a <NULL/> message.
+    The given message handler must be able to cope with a null message.
 */
 SAL_DLLPUBLIC pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc( pfunc_osl_printDebugMessage pNewFunc );
 
 /** sets a delivery function for detailed message information.
 
-    The given message handler must be able to cope with a <NULL/> message.
+    The given message handler must be able to cope with a null message.
 */
 SAL_DLLPUBLIC pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pfunc_osl_printDetailedDebugMessage pNewFunc );
 
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 7a8f5c189875..840f7a382c7d 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -42,8 +42,9 @@
 #include "sal/log.hxx"
 #include "sal/types.h"
 
+/// @cond INTERNAL
+
 namespace osl {
-/// @internal
 namespace detail {
 
 struct ObjectRegistryData;
@@ -53,27 +54,22 @@ struct ObjectRegistryData;
 
 extern "C" {
 
-/** @internal */
 SAL_DLLPUBLIC bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses(
         char const* pName )
     SAL_THROW_EXTERN_C();
 
-/** @internal */
 SAL_DLLPUBLIC bool SAL_CALL osl_detail_ObjectRegistry_checkObjectCount(
     ::osl::detail::ObjectRegistryData const& rData, ::std::size_t nExpected )
     SAL_THROW_EXTERN_C();
 
-/** @internal */
 SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_registerObject(
     ::osl::detail::ObjectRegistryData & rData, void const* pObj )
     SAL_THROW_EXTERN_C();
 
-/** @internal */
 SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_revokeObject(
     ::osl::detail::ObjectRegistryData & rData, void const* pObj )
     SAL_THROW_EXTERN_C();
 
-/** @internal */
 SAL_DLLPUBLIC ::osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex()
     SAL_THROW_EXTERN_C();
 
@@ -81,7 +77,6 @@ SAL_DLLPUBLIC ::osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex()
 
 namespace osl {
 
-/// @internal
 namespace detail {
 
 struct VoidPtrHash : ::std::unary_function<void const*, ::std::size_t> {
@@ -162,8 +157,8 @@ private:
     objects instead of just counting them.  This enables you to iterate over
     leaking objects in your debugger.
 
-    @tpl InheritingClassT binds the template instance to that class
-    @internal Use at own risk.
+    @tparam InheritingClassT binds the template instance to that class
+    @attention Use at own risk.
               For now this is just public (yet unpublished) API and may change
               in the future!
 */
@@ -198,6 +193,8 @@ private:
 
 } // namespace osl
 
+/// @endcond
+
 #endif // ! defined(OSL_DIAGNOSE_HXX_INCLUDED)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index ecf9e60a4d68..2a8cf378330b 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-/** @HTML */
-
 #ifndef _OSL_FILE_H_
 #define _OSL_FILE_H_
 
@@ -1216,7 +1214,7 @@ typedef void (SAL_CALL *oslDirectoryCreationCallbackFunc)(void* pData, rtl_uStri
     [in] The absolute file URL of the directory path to create.
     A relative file URL will not be accepted.
 
-    @param aDirectoryCreationFunc
+    @param aDirectoryCreationCallbackFunc
     [in] Pointer to a function that will be called synchronously
     for each sub directory that was created. The value of this
     parameter may be NULL, in this case notifications will not be
@@ -1517,12 +1515,12 @@ typedef sal_uInt32 (SAL_CALL *oslCalcTextWidthFunc)( rtl_uString *ustrText );
     @param pustrCompacted [out]
     Receives the compacted system path on output
 
-    @param pfnCalcWidth [in]
+    @param pCalcWidth [in]
     Function ptr that calculates the width of a string. Can be zero.
 
     @param uMaxWidth [in]
-    Maximum width allowed that is retunrned from pfnCalcWidth.
-    If pfnCalcWidth is zero the character count is assumed as width.
+    Maximum width allowed that is retunrned from pCalcWidth.
+    If pCalcWidth is zero the character count is assumed as width.
 
     @return
     osl_File_E_None on success<br>
@@ -1587,7 +1585,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_setFileTime(
 
 /** Retrieves the file URL of the system's temporary directory path
 
-    @param pustrTempDirURL[out]
+    @param[out] pustrTempDirURL
     On success receives the URL of system's temporary directory path.
 
     @return
@@ -1610,6 +1608,16 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getTempDirURL(
     it, the file will be automatically removed on close else the caller is
     responsible for removing the file on success.
 
+    Description of the different pHandle, ppustrTempFileURL parameter combinations.
+    pHandle is 0 and ppustrTempDirURL is 0 - this combination is invalid
+    pHandle is not 0 and ppustrTempDirURL is 0 - a handle to the open file
+    will be returned on success and the file will be automatically removed on close.
+    pHandle is 0 and ppustrTempDirURL is not 0 - the name of the file will be returned,
+    the caller is responsible for opening, closing and removing the file.
+    pHandle is not 0 and ppustrTempDirURL is not 0 - a handle to the open file as well as
+    the file name will be returned, the caller is responsible for closing and removing
+    the file.
+
     @param  pustrDirectoryURL [in]
     Specifies the full qualified URL where the temporary file should be created.
     If pustrDirectoryURL is 0 the path returned by osl_getTempDirURL will be used.
@@ -1626,17 +1634,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getTempDirURL(
     file and is responsible for removing the file, in this case
     *ppustrTempFileURL must be 0 or must point to a valid rtl_uString.
 
-    @descr
-    Description of the different pHandle, ppustrTempFileURL parameter combinations.
-    pHandle is 0 and ppustrTempDirURL is 0 - this combination is invalid
-    pHandle is not 0 and ppustrTempDirURL is 0 - a handle to the open file
-    will be returned on success and the file will be automatically removed on close.
-    pHandle is 0 and ppustrTempDirURL is not 0 - the name of the file will be returned,
-    the caller is responsible for opening, closing and removing the file.
-    pHandle is not 0 and ppustrTempDirURL is not 0 - a handle to the open file as well as
-    the file name will be returned, the caller is responsible for closing and removing
-    the file.
-
     @return
     osl_File_E_None   on success
     osl_File_E_INVAL  the format of the parameter is invalid
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index b02ce853c91e..e64e2f0aac71 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-/** @HTML */
-
 #ifndef _OSL_FILE_HXX_
 #define _OSL_FILE_HXX_
 
diff --git a/sal/inc/osl/interlck.h b/sal/inc/osl/interlck.h
index 23557f934ffd..b56e8bd3a361 100644
--- a/sal/inc/osl/interlck.h
+++ b/sal/inc/osl/interlck.h
@@ -38,13 +38,13 @@ extern "C" {
 typedef sal_Int32 oslInterlockedCount;
 
 /** Increments the count variable addressed by pCount.
-    @param Address of counter variable
+    @param pCount Address of counter variable
     @return The result of the operation is zero, the value of the count variable.
 */
 SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount);
 
 /** Decrement the count variable addressed by pCount.
-    @param Address of counter variable
+    @param pCount Address of counter variable
     @return The result of the operation is the new value is of the count variable.
 */
 SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount);
diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h
index 7d00284d5843..36a7bfabf262 100644
--- a/sal/inc/osl/module.h
+++ b/sal/inc/osl/module.h
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-/** @HTML */
-
 #ifndef _OSL_MODULE_H_
 #define _OSL_MODULE_H_
 
@@ -71,12 +69,14 @@ typedef void ( SAL_CALL *oslGenericFunction )( void );
 
 /** Load a shared library or module.
     @param strModuleName denotes the name of the module to be loaded.
+    @param nRtldMode denotes the mode.
     @return NULL if the module could not be loaded, otherwise a handle to the module.
 */
 SAL_DLLPUBLIC oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMode);
 
 /** Load a shared library or module.
     @param pModuleName denotes the name of the module to be loaded.
+    @param nRtldMode denotes the mode.
     @return NULL if the module could not be loaded, otherwise a handle to the module.
     @since UDK 3.6
 */
@@ -190,7 +190,7 @@ SAL_DLLPUBLIC oslGenericFunction SAL_CALL osl_getFunctionSymbol(
     @param Module
     [in] a module handle as returned by osl_loadModule or osl_getModuleHandle
 
-    @param pFunctionSymbolName
+    @param pSymbol
     [in] Name of the function that will be looked up.
 
     @return
diff --git a/sal/inc/osl/module.hxx b/sal/inc/osl/module.hxx
index 3ece623d1aa9..c8d39a2ed6ac 100644
--- a/sal/inc/osl/module.hxx
+++ b/sal/inc/osl/module.hxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-/** @HTML */
-
 #ifndef _OSL_MODULE_HXX_
 #define _OSL_MODULE_HXX_
 
diff --git a/sal/inc/osl/profile.h b/sal/inc/osl/profile.h
index 28e9be4cbba6..bc4b8ffe4ead 100644
--- a/sal/inc/osl/profile.h
+++ b/sal/inc/osl/profile.h
@@ -118,7 +118,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_writeProfileIdent(
 
 /** Deprecated API.
     Acquire the mutex, block if already acquired by another thread.
-    @param Profile handle to a opened profile.
     @return False if section or entry could not be found.
     @deprecated
 */
@@ -128,7 +127,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_removeProfileEntry(
 
 /** Deprecated API.
     Get all entries belonging to the specified section.
-    @param Profile handle to a opened profile.
     @return Pointer to a array of pointers.
     @deprecated
 */
@@ -138,7 +136,6 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getProfileSectionEntries(
 
 /** Deprecated API.
     Get all section entries
-    @param Profile handle to a opened profile.
     @return Pointer to a array of pointers.
     @deprecated
 */
diff --git a/sal/inc/osl/security.h b/sal/inc/osl/security.h
index 2b91321ec2fc..ed9d9b5e45ab 100644
--- a/sal/inc/osl/security.h
+++ b/sal/inc/osl/security.h
@@ -61,9 +61,9 @@ SAL_DLLPUBLIC oslSecurity SAL_CALL osl_getCurrentSecurity(void);
 /** Deprecated API
     Create a security handle for the denoted user.
     Try to log in the user on the local system.
-    @param strzUserName [in] denotes the name of the user to logg in.
-    @param strPasswd [in] the password for this user.
-    @param pSecurity [out] returns the security handle if user could be logged in.
+    @param[in] strzUserName denotes the name of the user to logg in.
+    @param[in] strPasswd the password for this user.
+    @param[out] pSecurity returns the security handle if user could be logged in.
     @return osl_Security_E_None if user could be logged in, otherwise an error-code.
     @see osl_freeSecurityHandle
     @see osl_executeProcess
@@ -78,10 +78,10 @@ SAL_DLLPUBLIC oslSecurityError SAL_CALL osl_loginUser(
 /** Create a security handle for the denoted user.
     Try to log in the user on the denoted file server. On success the homedir will be
     the maped drive on this server.
-    @param strUserName [in] denotes the name of the user to logg in.
-    @param strPasswd [in] the password for this user.
-    @param strFileServer [in] denotes the file server on wich the user is logged in.
-    @param pSecurity [out] returns the security handle if user could be logged in.
+    @param[in] strUserName denotes the name of the user to logg in.
+    @param[in] strPasswd the password for this user.
+    @param[in] strFileServer denotes the file server on wich the user is logged in.
+    @param[out] pSecurity returns the security handle if user could be logged in.
     @return osl_Security_E_None if user could be logged in, otherwise an error-code.
     @see osl_freeSecurityHandle
     @see osl_executeProcess
@@ -95,46 +95,46 @@ SAL_DLLPUBLIC oslSecurityError SAL_CALL osl_loginUserOnFileServer(
     );
 
 /** Query if the user who is denotes by this security has administrator rigths.
-    @param Security [in] the security handle for th user.
+    @param[in] Security the security handle for th user.
     @return True, if the user has adminsitrator rights, otherwise false.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isAdministrator(
         oslSecurity Security);
 
 /** Free the security handle, created by osl_loginUser or osl_getCurrentSecurity.
-    @param Security [in] the security handle.
+    @param[in] Security the security handle.
     @see osl_loginUser
 */
 SAL_DLLPUBLIC void SAL_CALL osl_freeSecurityHandle(
         oslSecurity Security);
 
 /** Get the login ident for the user of this security handle.
-    @param Security [in] the security handle.
-    @param strIdent [out] the string that receives the ident on success.
+    @param[in] Security the security handle.
+    @param[out] strIdent the string that receives the ident on success.
     @return True, if the security handle is valid, otherwise False.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getUserIdent(
         oslSecurity Security, rtl_uString **strIdent);
 
 /** Get the login name for the user of this security handle.
-    @param Security [in] the security handle.
-    @param pszName [out] the string that receives the user name on success.
+    @param[in] Security the security handle.
+    @param[out] strName the string that receives the user name on success.
     @return True, if the security handle is valid, otherwise False.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getUserName(
         oslSecurity Security, rtl_uString **strName);
 
 /** Get the home directory of the user of this security handle.
-    @param Security [in] the security handle.
-    @param strDirectory [out] the string that receives the directory path on success.
+    @param[in] Security the security handle.
+    @param[out] strDirectory the string that receives the directory path on success.
     @return True, if the security handle is valid, otherwise False.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getHomeDir(
         oslSecurity Security, rtl_uString **strDirectory);
 
 /** Get the directory for configuration data of the user of this security handle.
-    @param Security [in] the security handle.
-    @param strDirectory [out] the string that receives the directory path on success.
+    @param[in] Security the security handle.
+    @param[out] strDirectory the string that receives the directory path on success.
     @return True, if the security handle is valid, otherwise False.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getConfigDir(
@@ -143,7 +143,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getConfigDir(
 
 /** Load Profile of the User
     Implemented just for Windows
-    @param oslSecurity Security [in] previously fetch Security of the User
+    @param[in] Security previously fetch Security of the User
     @return True if the Profile could successfully loaded, False otherwise.
 */
 
@@ -153,7 +153,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_loadUserProfile(
 
 /** Unload a User Profile
     Implemented just for Windows
-    @param oslSecurity Security [in] previously fetch Security of the User
+    @param[in] Security previously fetch Security of the User
     @return nothing is returned!
 */
 
diff --git a/sal/inc/osl/security_decl.hxx b/sal/inc/osl/security_decl.hxx
index a6078ea62c8b..64664c62d916 100644
--- a/sal/inc/osl/security_decl.hxx
+++ b/sal/inc/osl/security_decl.hxx
@@ -57,8 +57,8 @@ public:
         @return True, if the specified user is known by the underlying operating system,
         otherwise False
     */
-    inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName,
-                                       const ::rtl::OUString& strPasswd);
+    inline sal_Bool SAL_CALL logonUser(const rtl::OUString& strName,
+                                       const rtl::OUString& strPasswd);
     /** get the security information for one user.
         This method will try to login the user at the denoted file server.
         If a network resource named \\server\username exists and this resource
@@ -69,37 +69,37 @@ public:
         @return True, if the specified user is known by file server and the
         could be connected, otherwise False
     */
-    inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString & strName,
-                                       const ::rtl::OUString & strPasswd,
-                                       const ::rtl::OUString & strFileServer);
+    inline sal_Bool SAL_CALL logonUser(const rtl::OUString & strName,
+                                       const rtl::OUString & strPasswd,
+                                       const rtl::OUString & strFileServer);
 
     /** get the ident of the logged in user.
         @param strName [out] is the buffer which returns the name
         @param max [in] is the size of this buffer
         @return True, if any user is successfuly logged in, otherwise False
     */
-    inline sal_Bool  SAL_CALL getUserIdent( ::rtl::OUString& strIdent) const;
+    inline sal_Bool  SAL_CALL getUserIdent( rtl::OUString& strIdent) const;
 
     /** get the name of the logged in user.
         @param strName [out] is the buffer which returns the name
         @param max [in] is the size of this buffer
         @return True, if any user is successfuly logged in, otherwise False
     */
-    inline sal_Bool SAL_CALL getUserName( ::rtl::OUString& strName) const;
+    inline sal_Bool SAL_CALL getUserName( rtl::OUString& strName) const;
 
     /** get the home directory of the logged in user.
         @param strDirectory [out] is the buffer which returns the directory name
         @param max [in] is the size of this buffer
         @return True, if any user is successfuly logged in, otherwise False
     */
-    inline sal_Bool SAL_CALL getHomeDir( ::rtl::OUString& strDirectory) const;
+    inline sal_Bool SAL_CALL getHomeDir( rtl::OUString& strDirectory) const;
 
     /** get the directory for configuration data of the logged in user.
         @param strDirectory [out] is the buffer which returns the directory name
         @param max [in] is the size of this buffer
         @return True, if any user is successfuly logged in, otherwise False
     */
-    inline sal_Bool SAL_CALL getConfigDir( ::rtl::OUString & strDirectory) const;
+    inline sal_Bool SAL_CALL getConfigDir( rtl::OUString & strDirectory) const;
 
     /** Query if the user who is logged inhas administrator rigths.
         @return True, if the user has administrator rights, otherwise false.
diff --git a/sal/inc/osl/socket.h b/sal/inc/osl/socket.h
index 1e81bb823090..87df6721c3d2 100644
--- a/sal/inc/osl/socket.h
+++ b/sal/inc/osl/socket.h
@@ -44,10 +44,6 @@ extern "C" {
 #define OSL_INVALID_PORT (-1)
 #define OSL_INVALID_IPX_SOCKET_NO   0xffffffff
 
-/**@HTML
-
-*/
-
 /**
     Opaque datatype SocketAddr.
 */
diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx
index 6376c1bc3613..38d024218756 100644
--- a/sal/inc/osl/socket_decl.hxx
+++ b/sal/inc/osl/socket_decl.hxx
@@ -33,8 +33,6 @@
 #include <rtl/ustring.hxx>
 #include <rtl/byteseq.hxx>
 
-/** @HTML
- */
 namespace osl
 {
     enum __osl_socket_NoCopy { SAL_NO_COPY };
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index c19d8d2cb3e2..7a3ac10a1f30 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -37,6 +37,8 @@
 
 #include <cstddef>
 
+/// @cond INTERNAL
+
 //######################################################
 // This is no general purpose STL allocator but one
 // necessary to use STL for some implementation but
@@ -49,7 +51,6 @@
 
 namespace rtl {
 
-/** @internal */
 template<class T>
 class Allocator
 {
@@ -156,14 +157,12 @@ public:
 // references above) that's why the operators below
 // return always true or false
 
-/** @internal */
 template<class T, class U>
 inline bool operator== (const Allocator<T>&, const Allocator<U>&) SAL_THROW(())
 {
     return true;
 }
 
-/** @internal */
 template<class T, class U>
 inline bool operator!= (const Allocator<T>&, const Allocator<U>&) SAL_THROW(())
 {
@@ -172,16 +171,12 @@ inline bool operator!= (const Allocator<T>&, const Allocator<U>&) SAL_THROW(())
 
 } /* namespace rtl */
 
-//######################################################
 /** REQUIRED BY STLPort (see stlport '_alloc.h'):
     Hack for compilers that do not support member
     template classes (e.g. MSVC 6)
-
-    @internal
 */
 namespace _STL
 {
-    /** @internal */
     template<class T, class U>
     inline ::rtl::Allocator<U> & __stl_alloc_rebind (::rtl::Allocator<T> & a, U const *)
     {
@@ -189,6 +184,8 @@ namespace _STL
     }
 }
 
+/// @endcond
+
 #endif /* INCLUDED_RTL_ALLOCATOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h
index a88b5ad9c0bc..3f89bde31d31 100644
--- a/sal/inc/rtl/bootstrap.h
+++ b/sal/inc/rtl/bootstrap.h
@@ -35,7 +35,6 @@ extern "C" {
 #endif
 
 /**
-   @HTML
    @file
 
    The described concept provides a platform independent way to access
diff --git a/sal/inc/rtl/bootstrap.hxx b/sal/inc/rtl/bootstrap.hxx
index dca3e84ce4c8..874ce5e763e6 100644
--- a/sal/inc/rtl/bootstrap.hxx
+++ b/sal/inc/rtl/bootstrap.hxx
@@ -36,9 +36,7 @@ namespace rtl
     {
         void * _handle;
 
-        /** @internal */
         inline Bootstrap( Bootstrap const & ); // not impl
-        /** @internal */
         inline Bootstrap & operator = ( Bootstrap const & ); // not impl
 
     public:
@@ -74,9 +72,9 @@ namespace rtl
 
         /** Sets a bootstrap parameter.
 
-            @param pName
+            @param name
                    name of bootstrap parameter
-            @param pValue
+            @param value
                    value of bootstrap parameter
 
             @see rtl_bootstrap_set()
diff --git a/sal/inc/rtl/byteseq.h b/sal/inc/rtl/byteseq.h
index ee321c24e7b7..93e85ddcd500 100644
--- a/sal/inc/rtl/byteseq.h
+++ b/sal/inc/rtl/byteseq.h
@@ -166,24 +166,21 @@ enum __ByteSequence_NoAcquire
 class ByteSequence
 {
     /** sequence handle
-        @internal
     */
     sal_Sequence * _pSequence;
 
 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
 
     /** Default constructor: Creates an empty sequence.
     */
diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index bcb1791e364b..943a449413a7 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -379,9 +379,9 @@ namespace rtl {
     ...
     </pre>
 
-    @tplparam T
+    @tparam T
               variable's type
-    @tplparam Unique
+    @tparam Unique
               Implementation trick to make the inner static holder unique,
               using the outer class
               (the one that derives from this base class)
@@ -439,9 +439,9 @@ private:
     ...
     </pre>
 
-    @tplparam T
+    @tparam T
               variable's type
-    @tplparam Unique
+    @tparam Unique
               Implementation trick to make the inner static holder unique,
               using the outer class
               (the one that derives from this base class)
@@ -523,9 +523,9 @@ private:
 /** Helper class for a late-initialized static aggregate, e.g. an array,
     implementing the double-checked locking pattern correctly.
 
-    @tplparam T
+    @tparam T
               aggregate's element type
-    @tplparam InitAggregate
+    @tparam InitAggregate
               initializer functor class
 */
 #if (__GNUC__ >= 4)
@@ -580,16 +580,16 @@ public:
     ...
     </pre>
 
-    @tplparam T
+    @tparam T
               variable's type
-    @tplparam InitData
+    @tparam InitData
               initializer functor class
-    @tplparam Unique
+    @tparam Unique
               Implementation trick to make the inner static holder unique,
               using the outer class
               (the one that derives from this base class).
               Default is InitData (common practice).
-    @tplparam Data
+    @tparam Data
               Initializer functor's return type.
               Default is T (common practice).
 */
diff --git a/sal/inc/rtl/math.h b/sal/inc/rtl/math.h
index c2c087d3474a..77f29b129b23 100644
--- a/sal/inc/rtl/math.h
+++ b/sal/inc/rtl/math.h
@@ -59,9 +59,9 @@ enum rtl_math_StringFormat
      */
     rtl_math_StringFormat_Automatic,
 
-    /** @internal
-     */
+    /** @cond INTERNAL */
     rtl_math_StringFormat_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
+    /** @endcond */
 };
 
 /** Status for rtl_math_stringToDouble and rtl_math_uStringToDouble.
@@ -76,9 +76,9 @@ enum rtl_math_ConversionStatus
      */
     rtl_math_ConversionStatus_OutOfRange,
 
-    /** @internal
-     */
+    /** @cond INTERNAL */
     rtl_math_ConversionStatus_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
+    /** @endcond */
 };
 
 /** Rounding modes for rtl_math_round.
@@ -117,9 +117,9 @@ enum rtl_math_RoundingMode
      */
     rtl_math_RoundingMode_HalfEven,
 
-    /** @internal
-     */
+    /** @cond INTERNAL */
     rtl_math_RoundingMode_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
+    /** @endcond */
 };
 
 /** Special decimal places constants for rtl_math_doubleToString and
diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 14581ee0b2f9..2018308f9c6c 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -251,7 +251,7 @@ inline double acosh(double fValue)
 /** Test equality of two values with an accuracy of the magnitude of the
     given values scaled by 2^-48 (4 bits roundoff stripped).
 
-    @ATTENTION
+    @attention
     approxEqual( value!=0.0, 0.0 ) _never_ yields true.
  */
 inline bool approxEqual(double a, double b)
diff --git a/sal/inc/rtl/ref.hxx b/sal/inc/rtl/ref.hxx
index abe96e947eed..83bfc60b41eb 100644
--- a/sal/inc/rtl/ref.hxx
+++ b/sal/inc/rtl/ref.hxx
@@ -229,14 +229,15 @@ public:
     }
 };
 
-/** @internal
-    Enables boost::mem_fn and boost::bind to recognize Reference.
+/// @cond INTERNAL
+/** Enables boost::mem_fn and boost::bind to recognize Reference.
 */
 template <typename T>
 inline T * get_pointer( Reference<T> const& r )
 {
     return r.get();
 }
+/// @endcond
 
 } // namespace rtl
 
diff --git a/sal/inc/rtl/strbuf.h b/sal/inc/rtl/strbuf.h
index deebd89d7d16..50205154b0df 100644
--- a/sal/inc/rtl/strbuf.h
+++ b/sal/inc/rtl/strbuf.h
@@ -35,8 +35,7 @@
 extern "C" {
 #endif
 
-/** @HTML
-    Allocates a new <code>String</code> that contains characters from
+/** Allocates a new <code>String</code> that contains characters from
     the character array argument.
 
     The <code>count</code> argument specifies
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 2f92b0fc23c3..4df6e3be4fa6 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -41,9 +41,7 @@
 namespace rtl
 {
 
-/** @HTML
-
-    A string buffer implements a mutable sequence of characters.
+/** A string buffer implements a mutable sequence of characters.
     <p>
     String buffers are safe for use by multiple threads. The methods
     are synchronized where necessary so that all the operations on any
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index 7b2354711f5a..9b5f2944a637 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -781,9 +781,8 @@ SAL_DLLPUBLIC double SAL_CALL rtl_str_toDouble(
 #   pragma pack(push, 8)
 #endif
 
+/** @cond INTERNAL */
 /** The implementation of a byte string.
-
-    @internal
  */
 typedef struct _rtl_String
 {
@@ -791,6 +790,7 @@ typedef struct _rtl_String
     sal_Int32           length;
     sal_Char            buffer[1];
 } rtl_String;
+/** @endcond */
 
 #if defined(SAL_W32)
 #pragma pack(pop)
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 0db8341a8930..ccd96b9656a4 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -75,14 +75,13 @@ namespace rtl
 class OString
 {
 public:
-    /** @internal */
+    /// @cond INTERNAL
     rtl_String * pData;
+    /// @endcond
 
 private:
-    /** @internal */
     class DO_NOT_ACQUIRE;
 
-    /** @internal */
     OString( rtl_String * value, DO_NOT_ACQUIRE * )
     {
         pData = value;
diff --git a/sal/inc/rtl/unload.h b/sal/inc/rtl/unload.h
index 5e70690342b5..9479f82ceb90 100644
--- a/sal/inc/rtl/unload.h
+++ b/sal/inc/rtl/unload.h
@@ -33,7 +33,6 @@
 #include <osl/interlck.h>
 #include <osl/module.h>
 
-///@HTML
 /** @file
 The API enables an effective way of unloading libraries in a centralized way.
 The mechanism ensures that used libraries are not unloaded. This prevents
diff --git a/sal/inc/rtl/uri.h b/sal/inc/rtl/uri.h
index d0f5e0009971..3651db002bfa 100644
--- a/sal/inc/rtl/uri.h
+++ b/sal/inc/rtl/uri.h
@@ -59,7 +59,7 @@ typedef enum
      */
     rtl_UriCharClassNone,
 
-    /** The RFC 2732 <uric> char class.
+    /** The RFC 2732 @<uric> char class.
 
         @descr
         The 'valid' characters are !$&'()*+,-./:;=?@[]_~ plus digits and
@@ -67,35 +67,35 @@ typedef enum
      */
     rtl_UriCharClassUric,
 
-    /** The RFC 2396 <uric_no_slash> char class.
+    /** The RFC 2396 @<uric_no_slash> char class.
 
         @descr
         The 'valid' characters are !$&'()*+,-.:;=?@_~ plus digits and letters.
      */
     rtl_UriCharClassUricNoSlash,
 
-    /** The RFC 2396 <rel_segment> char class.
+    /** The RFC 2396 @<rel_segment> char class.
 
         @descr
         The 'valid' characters are !$&'()*+,-.;=@_~ plus digits and letters.
      */
     rtl_UriCharClassRelSegment,
 
-    /** The RFC 2396 <reg_name> char class.
+    /** The RFC 2396 @<reg_name> char class.
 
         @descr
         The 'valid' characters are !$&'()*+,-.:;=@_~ plus digits and letters.
      */
     rtl_UriCharClassRegName,
 
-    /** The RFC 2396 <userinfo> char class.
+    /** The RFC 2396 @<userinfo> char class.
 
         @descr
         The 'valid' characters are !$&'()*+,-.:;=_~ plus digits and letters.
      */
     rtl_UriCharClassUserinfo,
 
-    /** The RFC 2396 <pchar> char class.
+    /** The RFC 2396 @<pchar> char class.
 
         @descr
         The 'valid' characters are !$&'()*+,-.:=@_~ plus digits and letters.
@@ -304,7 +304,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uriDecode(
 
 /** Convert a relative URI reference into an absolute one.
 
-    A URI reference is a URI plus an optional <"#" fragment> part.
+    A URI reference is a URI plus an optional @<"#" fragment> part.
 
     This function uses the algorithm described in RFC 2396, section 5.2, with
     the following clarifications:  (1) Backwards-compatible relative URIs
@@ -323,7 +323,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uriDecode(
     An absolute, hierarchical URI reference that serves as the base URI.  If it
     has to be inspected (i.e., pRelUriRef is not an absolute URI already), and
     if it either is not an absolute URI (i.e., does not begin with a
-    <scheme ":"> part) or has a path that is non-empty but does not start
+    @<scheme ":"> part) or has a path that is non-empty but does not start
     with "/", an exception will be signaled.
 
     @param pRelUriRef
diff --git a/sal/inc/rtl/uri.hxx b/sal/inc/rtl/uri.hxx
index c4bb81bd0e02..40bb9ad85124 100644
--- a/sal/inc/rtl/uri.hxx
+++ b/sal/inc/rtl/uri.hxx
@@ -77,20 +77,16 @@ public:
         rtl::OUString const & rBaseUriRef, rtl::OUString const & rRelUriRef);
 
 private:
-    /** not implemented
-        @internal */
+    /** not implemented */
     Uri();
 
-    /** not implemented
-        @internal */
+    /** not implemented */
     Uri(Uri &);
 
-    /** not implemented
-        @internal */
+    /** not implemented */
     ~Uri();
 
-    /** not implemented
-        @internal */
+    /** not implemented */
     void operator =(Uri);
 };
 
diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h
index bc73f2a1cd18..a37cb6e9b082 100644
--- a/sal/inc/rtl/ustrbuf.h
+++ b/sal/inc/rtl/ustrbuf.h
@@ -35,8 +35,7 @@
 extern "C" {
 #endif
 
-/** @HTML
-    Allocates a new <code>String</code> that contains characters from
+/** Allocates a new <code>String</code> that contains characters from
     the character array argument.
 
     The <code>count</code> argument specifies
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 74df4fe9beb0..de499428bc4e 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -40,8 +40,7 @@
 namespace rtl
 {
 
-/** @HTML
-    A string buffer implements a mutable sequence of characters.
+/** A string buffer implements a mutable sequence of characters.
     <p>
     String buffers are safe for use by multiple threads. The methods
     are synchronized where necessary so that all the operations on any
@@ -576,7 +575,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      ch       a character array.
+        @param      str      a character array.
         @return     this string buffer.
      */
     OUStringBuffer & insert( sal_Int32 offset, const sal_Unicode * str )
@@ -598,7 +597,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      ch       a character array.
+        @param      str      a character array.
         @param      len     the number of characters to append.
         @return     this string buffer.
      */
@@ -645,7 +644,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      ch       a <code>char</code>.
+        @param      c        a <code>char</code>.
         @return     this string buffer.
 
         @since LibreOffice 3.6
@@ -669,7 +668,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      ch       a <code>char</code>.
+        @param      c        a <code>char</code>.
         @return     this string buffer.
      */
     OUStringBuffer & insert(sal_Int32 offset, sal_Unicode c)
@@ -691,7 +690,8 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      b        an <code>sal_Int32</code>.
+        @param      i        an <code>sal_Int32</code>.
+        @param      radix    the radix.
         @return     this string buffer.
         @exception  StringIndexOutOfBoundsException  if the offset is invalid.
      */
@@ -715,7 +715,8 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      b        a <code>long</code>.
+        @param      l        a <code>long</code>.
+        @param      radix    the radix.
         @return     this string buffer.
         @exception  StringIndexOutOfBoundsException  if the offset is invalid.
      */
@@ -739,7 +740,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      b        a <code>float</code>.
+        @param      f        a <code>float</code>.
         @return     this string buffer.
         @exception  StringIndexOutOfBoundsException  if the offset is invalid.
      */
@@ -763,7 +764,7 @@ public:
         string buffer.
 
         @param      offset   the offset.
-        @param      b        a <code>double</code>.
+        @param      d        a <code>double</code>.
         @return     this string buffer.
         @exception  StringIndexOutOfBoundsException  if the offset is invalid.
      */
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index c77b343d1d23..699d3a0e7309 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1111,9 +1111,8 @@ SAL_DLLPUBLIC double SAL_CALL rtl_ustr_toDouble(
 #pragma pack(push, 4)
 #endif
 
+/** @cond INTERNAL */
 /** The implementation of a Unicode string.
-
-    @internal
 */
 typedef struct _rtl_uString
 {
@@ -1121,6 +1120,7 @@ typedef struct _rtl_uString
     sal_Int32           length;
     sal_Unicode         buffer[1];
 } rtl_uString;
+/** @endcond */
 
 #if defined(SAL_W32)
 #pragma pack(pop)
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 868f6dd043cd..21bd99d87e07 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -76,14 +76,13 @@ namespace rtl
 class OUString
 {
 public:
-    /** @internal */
+    /// @cond INTERNAL
     rtl_uString * pData;
+    /// @endcond
 
 private:
-    /** @internal */
     class DO_NOT_ACQUIRE{};
 
-    /** @internal */
     OUString( rtl_uString * value, DO_NOT_ACQUIRE * )
     {
         pData = value;
@@ -123,10 +122,11 @@ public:
 
     /** New OUString from OUString data without acquiring it.  Takeover of ownership.
 
+        The SAL_NO_ACQUIRE dummy parameter is only there to distinguish this
+        from other constructors.
+
         @param str
                OUString data
-        @param dummy
-               SAL_NO_ACQUIRE to distinguish from other ctors
     */
     inline OUString( rtl_uString * str, __sal_NoAcquire ) SAL_THROW( () )
         { pData = str; }
@@ -666,7 +666,8 @@ public:
       equal as asciiStrLength.
       This function can't be used for language specific comparison.
 
-      @param    str         the object (substring) to be compared.
+      @param    asciiStr    the object (substring) to be compared.
+      @param    asciiStrLength the length of asciiStr.
       @param    fromIndex   the index to start the comparion from.
                             The index must be greater or equal than 0
                             and less or equal as the string length.
@@ -715,7 +716,7 @@ public:
 
       @param asciiStr a sequence of at least asciiStrLength ASCII characters
           (bytes in the range 0x00--0x7F)
-      @param asciiStrLen the length of asciiStr; must be non-negative
+      @param asciiStrLength the length of asciiStr; must be non-negative
       @return true if this string ends with asciiStr; otherwise, false is
       returned
 
@@ -736,7 +737,7 @@ public:
 
       @param asciiStr a sequence of at least asciiStrLength ASCII characters
           (bytes in the range 0x00--0x7F)
-      @param asciiStrLen the length of asciiStr; must be non-negative
+      @param asciiStrLength the length of asciiStr; must be non-negative
       @return true if this string ends with asciiStr, ignoring the case of ASCII
       letters ("A"--"Z" and "a"--"z"); otherwise, false is returned
      */
diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h
index 0c78e6833d07..9d831e0f9146 100644
--- a/sal/inc/rtl/uuid.h
+++ b/sal/inc/rtl/uuid.h
@@ -33,7 +33,6 @@
 #include <rtl/string.h>
 
 /**
-   @HTML
    @file
    Specification (from draft-leach-uuids-guids-01.txt )
 
diff --git a/sal/inc/sal/detail/log.h b/sal/inc/sal/detail/log.h
index 74292b76a3ee..ce9ac934e151 100644
--- a/sal/inc/sal/detail/log.h
+++ b/sal/inc/sal/detail/log.h
@@ -34,7 +34,7 @@
 
 #include "sal/types.h"
 
-/** @internal */
+/** @cond INTERNAL */
 
 /* This header makes available replacements working in both C and C++ for the
    obsolete osl/diagnose.h functionality that in turn is used from both C and
@@ -106,6 +106,8 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_logFormat(
         SAL_DETAIL_ENABLE_LOG_WARN && (condition), SAL_DETAIL_LOG_LEVEL_WARN, \
         area, SAL_DETAIL_WHERE, __VA_ARGS__)
 
+/** @endcond */
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index 918d9d6441b5..6eb152b2f78d 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -43,12 +43,12 @@
 // this code can be called from other sal code without causing endless
 // recursion.
 
-/// @internal
+/// @cond INTERNAL
+
 extern "C" SAL_DLLPUBLIC void SAL_CALL sal_detail_log(
     enum sal_detail_LogLevel level, char const * area, char const * where,
     char const * message);
 
-/// @internal
 namespace sal { namespace detail {
 
 inline void SAL_CALL log(
@@ -127,7 +127,6 @@ inline char const * unwrapStream(StreamIgnore const &) {
 
 } }
 
-/// @internal
 #define SAL_DETAIL_LOG_STREAM(condition, level, area, where, stream) \
     do { \
         if (condition) { \
@@ -147,6 +146,8 @@ inline char const * unwrapStream(StreamIgnore const &) {
         } \
     } while (false)
 
+/// @endcond
+
 /** A simple macro to create a "file and line number" string.
 
     Potentially not only useful within the log framework (where it is used
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
index 13c8d658400d..6fea2377e8cb 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -75,7 +75,7 @@ class SALHELPER_DLLPUBLIC SimpleReferenceObject
 public:
     inline SimpleReferenceObject() SAL_THROW(()): m_nCount(0) {}
 
-    /** @ATTENTION
+    /** @attention
         The results are undefined if, for any individual instance of
         SimpleReferenceObject, the total number of calls to acquire() exceeds
         the total number of calls to release() by a platform dependent amount
@@ -113,15 +113,15 @@ private:
     oslInterlockedCount m_nCount;
 
     /** not implemented
-        @internal
      */
     SALHELPER_DLLPRIVATE SimpleReferenceObject(SimpleReferenceObject &);
 
     /** not implemented
-        @internal
      */
     SALHELPER_DLLPRIVATE void operator =(SimpleReferenceObject);
 
+    /// @cond INTERNAL
+
 #ifdef _MSC_VER
 /* We can't now have these private with MSVC2008 at least, it leads to
    compilation errors in xmloff and other places.
@@ -129,14 +129,14 @@ private:
 protected:
 #endif
     /** not implemented (see general class documentation)
-        @internal
      */
     static void * operator new[](std::size_t);
 
     /** not implemented (see general class documentation)
-        @internal
      */
     static void operator delete[](void * pPtr);
+
+    /// @endcond
 };
 
 }
diff --git a/salhelper/inc/salhelper/singletonref.hxx b/salhelper/inc/salhelper/singletonref.hxx
index bf9dc69f7f87..2c86b12f1139 100644
--- a/salhelper/inc/salhelper/singletonref.hxx
+++ b/salhelper/inc/salhelper/singletonref.hxx
@@ -47,7 +47,7 @@ namespace salhelper{
 
 /** @short  template for implementing singleton classes.
 
-    @descr  Such classes can be instanciated everytimes they
+            Such classes can be instanciated everytimes they
             are needed. But the internal wrapped object will
             be created one times only. Of course its used
             resources are referenced one times only too.
@@ -100,7 +100,7 @@ class SingletonRef
 
         /** @short  standard ctor.
 
-            @descr  The internal wrapped object is created only,
+                    The internal wrapped object is created only,
                     if its ref count was 0. Otherwhise this method
                     does nothing ... except increasing of the internal
                     ref count!
@@ -124,7 +124,7 @@ class SingletonRef
 
         /** @short  standard dtor.
 
-            @descr  The internal wrapped object is removed only,
+                    The internal wrapped object is removed only,
                     if its ref count wil be 0. Otherwhise this method
                     does nothing ... except decreasing of the internal
                     ref count!
@@ -178,7 +178,7 @@ class SingletonRef
 
         /** @short  creates an own mutex for guarding static contents.
 
-            @descr  The global mutex the osl library is used one times
+                    The global mutex the osl library is used one times
                     only to create an own static mutex, which can be used
                     next time to guard own static member operations.
          */