summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-04-23 19:15:24 +0200
committerLuboš Luňák <l.lunak@suse.cz>2012-04-23 19:17:42 +0200
commit8d1fbba77fdec3cdc7c7b1e28f9560243cbbd3ff (patch)
treef5111893fc257eb1713db12b41fe49c8acf14ee6
parentf46f1421277d2432e3aef6923df13fc220bd15b9 (diff)
doxygen warning fixes
-rw-r--r--cppu/inc/com/sun/star/uno/Sequence.h2
-rw-r--r--cppu/inc/com/sun/star/uno/Type.h4
-rw-r--r--cppu/inc/typelib/typedescription.h4
-rw-r--r--cppuhelper/inc/cppuhelper/interfacecontainer.h6
-rw-r--r--cppuhelper/inc/cppuhelper/propshlp.hxx2
-rw-r--r--cppuhelper/inc/cppuhelper/weak.hxx6
-rw-r--r--sal/inc/rtl/string.hxx4
7 files changed, 14 insertions, 14 deletions
diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h
index 380bcb77c56c..6095fdd70aef 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/cppu/inc/com/sun/star/uno/Sequence.h
@@ -110,7 +110,7 @@ public:
@param dummy SAL_NO_ACQUIRE to force obvious distinction to other
constructors
*/
- inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire )
+ inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire dummy )
SAL_THROW(());
/** Constructor: Creates a copy of given elements.
diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h
index e11551e864d2..b6afd2e51c6b 100644
--- a/cppu/inc/com/sun/star/uno/Type.h
+++ b/cppu/inc/com/sun/star/uno/Type.h
@@ -112,14 +112,14 @@ public:
@param pType C type description reference
@param dummy UNO_TYPE_NO_ACQUIRE to force obvious distinction to other constructors
*/
- inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW(());
+ inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire dummy ) SAL_THROW(());
/** Constructor: Type is (copy) constructed by given C type description reference
without acquiring it.
@param pType C type description reference
@param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors
*/
- inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW(());
+ inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire dummy ) SAL_THROW(());
/** Copy constructor: Type is copy constructed by given type.
diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h
index c4d957a2d91a..346836ff9b78 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -330,8 +330,6 @@ typedef struct _typelib_InterfaceMethodTypeDescription
sal_Bool bOneWay;
/** the interface description this method is a member of
-
- @since #i21150#
*/
struct _typelib_InterfaceTypeDescription * pInterface;
/** the inherited direct base method (null for a method that is not
@@ -367,8 +365,6 @@ typedef struct _typelib_InterfaceAttributeTypeDescription
typelib_TypeDescriptionReference * pAttributeTypeRef;
/** the interface description this attribute is a member of
-
- @since #i21150#
*/
struct _typelib_InterfaceTypeDescription * pInterface;
/** the inherited direct base attribute (null for an attribute that is not
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h
index 8282893ec851..77c39f646294 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -331,7 +331,7 @@ public:
The lifetime must be longer than the lifetime
of this object.
*/
- inline OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex & ) SAL_THROW(());
+ inline OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex & rMutex ) SAL_THROW(());
/**
Deletes all containers.
*/
@@ -450,7 +450,7 @@ struct OBroadcastHelperVar
/**
Initialize the structur. bDispose and bInDispose are set to false.
- @param rMutex the mutex reference.
+ @param rMutex_ the mutex reference.
*/
OBroadcastHelperVar( ::osl::Mutex & rMutex_ ) SAL_THROW(())
: rMutex( rMutex_ )
@@ -536,7 +536,7 @@ public:
The lifetime must be longer than the lifetime
of this object.
*/
- OMultiTypeInterfaceContainerHelper( ::osl::Mutex & ) SAL_THROW(());
+ OMultiTypeInterfaceContainerHelper( ::osl::Mutex & rMutex ) SAL_THROW(());
/**
Delete all containers.
*/
diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx
index 08dee8822941..2812617d8f28 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -253,7 +253,7 @@ public:
The lifetime must be longer than the lifetime
of this object.
*/
- OMultiTypeInterfaceContainerHelperInt32( ::osl::Mutex & ) SAL_THROW(());
+ OMultiTypeInterfaceContainerHelperInt32( ::osl::Mutex & rMutex ) SAL_THROW(());
/**
Delete all containers.
*/
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index 8838797dfe5d..99599ac08bc8 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -117,11 +117,13 @@ public:
@param rObj dummy param
*/
- inline OWeakObject( const OWeakObject & ) SAL_THROW(())
+ inline OWeakObject( const OWeakObject & rObj ) SAL_THROW(())
: com::sun::star::uno::XWeak()
, m_refCount( 0 )
, m_pWeakConnectionPoint( 0 )
- {}
+ {
+ (void) rObj;
+ }
/** Dummy assignment operator. Does not affect reference count.
@return this OWeakObject
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 9791a8c70faa..1701b28b48b5 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -140,8 +140,10 @@ public:
/** New string from OString data without acquiring it. Takeover of ownership.
+ The SAL_NO_ACQUIRE dummy parameter is only there to distinguish this
+ from other constructors.
+
@param str a OString data.
- @param __sal_NoAcquire SAL_NO_ACQUIRE to distinguish from other ctors
*/
inline OString( rtl_String * str, __sal_NoAcquire ) SAL_THROW(())
{