[Libreoffice-commits] .: config_host.mk.in configure.in cppuhelper/inc cppu/inc odk/docs odk/index.html odk/pack odk/util registry/inc salhelper/inc sal/inc
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Thu Jan 5 10:44:27 PST 2012
config_host.mk.in | 1
configure.in | 35 ++++
cppu/inc/com/sun/star/uno/Any.h | 19 +-
cppu/inc/com/sun/star/uno/Reference.h | 13 -
cppu/inc/com/sun/star/uno/Sequence.h | 22 +--
cppu/inc/com/sun/star/uno/Sequence.hxx | 3
cppu/inc/com/sun/star/uno/Type.h | 46 +++---
cppu/inc/cppu/macros.hxx | 8 -
cppu/inc/cppu/unotype.hxx | 10 -
cppu/inc/typelib/typedescription.h | 8 -
cppu/inc/typelib/typedescription.hxx | 6
cppu/inc/uno/current_context.hxx | 2
cppu/inc/uno/dispatcher.hxx | 5
cppu/inc/uno/environment.hxx | 6
cppu/inc/uno/mapping.hxx | 10 -
cppuhelper/inc/cppuhelper/basemutex.hxx | 6
cppuhelper/inc/cppuhelper/bootstrap.hxx | 4
cppuhelper/inc/cppuhelper/compbase.hxx | 14 -
cppuhelper/inc/cppuhelper/compbase1.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase10.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase11.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase12.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase2.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase3.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase4.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase5.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase6.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase7.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase8.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase9.hxx | 15 --
cppuhelper/inc/cppuhelper/compbase_ex.hxx | 9 -
cppuhelper/inc/cppuhelper/component.hxx | 6
cppuhelper/inc/cppuhelper/factory.hxx | 2
cppuhelper/inc/cppuhelper/implbase.hxx | 16 --
cppuhelper/inc/cppuhelper/implbase1.hxx | 88 ++++++------
cppuhelper/inc/cppuhelper/implbase10.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase11.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase12.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase2.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase3.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase4.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase5.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase6.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase7.hxx | 88 +++++-------
cppuhelper/inc/cppuhelper/implbase8.hxx | 89 ++++++------
cppuhelper/inc/cppuhelper/implbase9.hxx | 88 +++++-------
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 15 --
cppuhelper/inc/cppuhelper/implbase_ex_post.hxx | 6
cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx | 7
cppuhelper/inc/cppuhelper/interfacecontainer.h | 16 +-
cppuhelper/inc/cppuhelper/propertysetmixin.hxx | 2
cppuhelper/inc/cppuhelper/queryinterface.hxx | 156 +++++++++++-----------
cppuhelper/inc/cppuhelper/typeprovider.hxx | 22 +--
cppuhelper/inc/cppuhelper/unourl.hxx | 6
cppuhelper/inc/cppuhelper/weak.hxx | 14 -
cppuhelper/inc/cppuhelper/weakagg.hxx | 2
cppuhelper/inc/cppuhelper/weakref.hxx | 6
odk/docs/cpp/ref/cpp.css | 127 -----------------
odk/index.html | 2
odk/pack/gendocu/Doxyfile | 51 +++++++
odk/pack/gendocu/main.dox | 31 ++++
odk/pack/gendocu/makefile.mk | 46 +++---
odk/util/check.pl | 133 +-----------------
registry/inc/registry/reader.h | 2
registry/inc/registry/reader.hxx | 2
registry/inc/registry/registry.hxx | 13 +
registry/inc/registry/types.h | 4
registry/inc/registry/version.h | 2
registry/inc/registry/writer.h | 2
registry/inc/registry/writer.hxx | 8 -
sal/inc/osl/diagnose.h | 4
sal/inc/osl/diagnose.hxx | 15 --
sal/inc/osl/file.h | 33 ++--
sal/inc/osl/file.hxx | 2
sal/inc/osl/interlck.h | 4
sal/inc/osl/module.h | 6
sal/inc/osl/module.hxx | 2
sal/inc/osl/profile.h | 3
sal/inc/osl/security.h | 38 ++---
sal/inc/osl/security_decl.hxx | 18 +-
sal/inc/osl/socket.h | 4
sal/inc/osl/socket_decl.hxx | 2
sal/inc/rtl/allocator.hxx | 11 -
sal/inc/rtl/bootstrap.h | 1
sal/inc/rtl/bootstrap.hxx | 6
sal/inc/rtl/byteseq.h | 7
sal/inc/rtl/instance.hxx | 20 +-
sal/inc/rtl/math.h | 12 -
sal/inc/rtl/math.hxx | 2
sal/inc/rtl/ref.hxx | 5
sal/inc/rtl/strbuf.h | 3
sal/inc/rtl/strbuf.hxx | 4
sal/inc/rtl/string.h | 4
sal/inc/rtl/string.hxx | 5
sal/inc/rtl/unload.h | 1
sal/inc/rtl/uri.h | 16 +-
sal/inc/rtl/uri.hxx | 12 -
sal/inc/rtl/ustrbuf.h | 3
sal/inc/rtl/ustrbuf.hxx | 21 +-
sal/inc/rtl/ustring.h | 4
sal/inc/rtl/ustring.hxx | 17 +-
sal/inc/rtl/uuid.h | 1
sal/inc/sal/detail/log.h | 4
sal/inc/sal/log.hxx | 7
salhelper/inc/salhelper/simplereferenceobject.hxx | 10 -
salhelper/inc/salhelper/singletonref.hxx | 8 -
106 files changed, 1110 insertions(+), 1376 deletions(-)
New commits:
commit 58ab12acf576a765ec47cc2753ba57643e51d653
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jan 5 19:40:38 2012 +0100
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).
diff --git a/config_host.mk.in b/config_host.mk.in
index a6d7c84..236a58c 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 2683a32..8f3b6da 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 eb29273..a2fe589 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 071cadc..d3611ac 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 68abc9d..13a4bf0 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 8a9b43d..c86c629 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 6490fa4..2072d6a 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 5c123e7..78df315 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 b8df4e0..eedd01d 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 333fc1c..6494e7c 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 3997f3d..2e3e72f 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 01d59a4..80a7ad8 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 90fdb3d..c657335 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 8fa4f3e..61b6b7a 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 a183cf0..2e50164 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 f145709..a00cb2a 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 cef4f2e..41c69ad 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 5827c63..eb57e18 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 ea65729..bc979f6 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 ea7c273..b1c2623 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 6f7c383..6e8df92 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 c965a7a..0656c83 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 ea755ca..e07f72e 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 425101f..388cd15 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 438f041..359331a 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 a010253..78168f2 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 ee168e0..f31c057 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 f7ef3e1..6ca62f7 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 aa7e683..4dc8da1 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 1e1660f..0c1e0cf 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 23515a8..ca7e0cc 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 255a802..ccbddc0 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 26427d6..2653908 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 09ae9e2..f7fe3a2 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 6974c4c..940e453 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 972de45..090a5d3 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 */
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list