diff options
Diffstat (limited to 'cppu')
89 files changed, 1435 insertions, 1435 deletions
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h index eb29273c16aa..e4d1a559b574 100644 --- a/cppu/inc/com/sun/star/uno/Any.h +++ b/cppu/inc/com/sun/star/uno/Any.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,13 +36,13 @@ namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno -{ +{ /** C++ class representing an IDL any. This class is used to transport any type defined in IDL. The class inherits from the @@ -68,101 +68,101 @@ public: /** @internal */ inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) {} - + /** Default constructor: Any holds no value; its type is void. */ inline Any() SAL_THROW( () ); - + /** Templated ctor. Sets a copy of the given value. - + @param value value of the Any */ template <typename T> explicit inline Any( T const & value ); /// Ctor support for C++ bool. explicit inline Any( bool value ); - + /** Copy constructor: Sets value of the given any. - + @param rAny another any */ inline Any( const Any & rAny ) SAL_THROW( () ); - + /** Constructor: Sets a copy of the given data. - + @param pData_ value @param rType type of value */ inline Any( const void * pData_, const Type & rType ) SAL_THROW( () ); - + /** Constructor: Sets a copy of the given data. - + @param pData_ value @param pTypeDescr type of value */ inline Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ); - + /** Constructor: Sets a copy of the given data. - + @param pData_ value @param pType type of value */ inline Any( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW( () ); - + /** Destructor: Destructs any content and frees memory. */ inline ~Any() SAL_THROW( () ); - + /** Assignment operator: Sets the value of the given any. - + @param rAny another any (right side) @return this any */ inline Any & SAL_CALL operator = ( const Any & rAny ) SAL_THROW( () ); - + /** Gets the type of the set value. - + @return a Type object of the set value */ inline const Type & SAL_CALL getValueType() const SAL_THROW( () ) { return * reinterpret_cast< const Type * >( &pType ); } /** Gets the type of the set value. - + @return the UNacquired type description reference of the set value */ inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const SAL_THROW( () ) { return pType; } - + /** Gets the type description of the set value. Provides ownership of the type description! Call an explicit typelib_typedescription_release() to release afterwards. - + @param a pointer to type description pointer */ inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const SAL_THROW( () ) { ::typelib_typedescriptionreference_getDescription( ppTypeDescr, pType ); } - + /** Gets the type class of the set value. - + @return the type class of the set value */ inline TypeClass SAL_CALL getValueTypeClass() const SAL_THROW( () ) { return (TypeClass)pType->eTypeClass; } - + /** Gets the type name of the set value. - + @return the type name of the set value */ inline ::rtl::OUString SAL_CALL getValueTypeName() const SAL_THROW( () ); - + /** Tests if any contains a value. - + @return true if any has a value, false otherwise */ inline sal_Bool SAL_CALL hasValue() const SAL_THROW( () ) { return (typelib_TypeClass_VOID != pType->eTypeClass); } - + /** Gets a pointer to the set value. - + @return a pointer to the set value */ inline const void * SAL_CALL getValue() const SAL_THROW( () ) @@ -185,66 +185,66 @@ public: template <typename T> inline T get() const; #endif // ! defined(EXCEPTIONS_OFF) - + /** Sets a value. If the any already contains a value, that value will be destructed and its memory freed. - + @param pData_ pointer to value @param rType type of value */ inline void SAL_CALL setValue( const void * pData_, const Type & rType ) SAL_THROW( () ); /** Sets a value. If the any already contains a value, that value will be destructed and its memory freed. - + @param pData_ pointer to value @param pType type of value */ inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW( () ); /** Sets a value. If the any already contains a value, that value will be destructed and its memory freed. - + @param pData_ pointer to value @param pTypeDescr type description of value */ inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ); - + /** Clears this any. If the any already contains a value, that value will be destructed and its memory freed. After this has been called, the any does not contain a value. */ inline void SAL_CALL clear() SAL_THROW( () ); - + /** Tests whether this any is extractable to a value of given type. Widening conversion without data loss is taken into account. - + @param rType destination type @return true if this any is extractable to value of given type (e.g. using >>= operator) */ inline sal_Bool SAL_CALL isExtractableTo( const Type & rType ) const SAL_THROW( () ); - + /** Tests whether this any can provide a value of specified type. Widening conversion without data loss is taken into account. - + @return true if this any can provide a value of specified type (e.g. using >>= operator) */ template <typename T> inline bool has() const; - + /** Equality operator: compares two anys. The values need not be of equal type, e.g. a short integer is compared to a long integer. - + @param rAny another any (right side) @return true if both any contains equal values */ inline sal_Bool SAL_CALL operator == ( const Any & rAny ) const SAL_THROW( () ); /** Unequality operator: compares two anys. The values need not be of equal type, e.g. a short integer is compared to a long integer. - + @param rAny another any (right side) @return true if both any contains unequal values */ inline sal_Bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW( () ); - + private: // not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16) explicit Any( sal_uInt16 ); @@ -293,7 +293,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) /** Template binary >>= operator to assign a value from an any. 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 @param rAny source any (left side) @param value destination value (right side) @@ -301,12 +301,12 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) */ template< class C > inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( () ); - + /** Template equality operator: compares set value of left side any to right side value. The values need not be of equal type, e.g. a short integer is compared to a long integer. This operator can be implemented as template member function, if all supported compilers can cope with template member functions. - + @tplparam C value type @param rAny another any (left side) @param value a value (right side) @@ -318,7 +318,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_T The values need not be of equal type, e.g. a short integer is compared to a long integer. This operator can be implemented as template member function, if all supported compilers can cope with template member functions. - + @tplparam C value type @param rAny another any (left side) @param value a value (right side) @@ -369,10 +369,10 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v } /** Gets the meta type of IDL type any. - + 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 @return type of IDL type any */ diff --git a/cppu/inc/com/sun/star/uno/Any.hxx b/cppu/inc/com/sun/star/uno/Any.hxx index 8ea8c437dde2..da95bb8393b2 100644 --- a/cppu/inc/com/sun/star/uno/Any.hxx +++ b/cppu/inc/com/sun/star/uno/Any.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,13 +36,13 @@ #include "cppu/unotype.hxx" namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno -{ +{ //__________________________________________________________________________________________________ inline Any::Any() SAL_THROW( () ) @@ -183,7 +183,7 @@ inline sal_Bool Any::operator != ( const Any & rAny ) const SAL_THROW( () ) //__________________________________________________________________________________________________ template< class C > inline Any SAL_CALL makeAny( const C & value ) SAL_THROW( () ) -{ +{ return Any( &value, ::cppu::getTypeFavourUnsigned(&value) ); } @@ -199,7 +199,7 @@ inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW( () ) //__________________________________________________________________________________________________ template< class C > inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW( () ) -{ +{ const Type & rType = ::cppu::getTypeFavourUnsigned(&value); ::uno_type_any_assign( &rAny, const_cast< C * >( &value ), rType.getTypeLibType(), diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h index 071cadcfde7b..1ed01fcc7782 100644 --- a/cppu/inc/com/sun/star/uno/Reference.h +++ b/cppu/inc/com/sun/star/uno/Reference.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,13 +32,13 @@ namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno -{ +{ class RuntimeException; class XInterface; @@ -66,9 +66,9 @@ protected: /** the interface pointer */ XInterface * _pInterface; - + /** Queries given interface for type rType. - + @param pInterface interface pointer @param rType interface type @return interface of demanded type (may be null) @@ -78,7 +78,7 @@ protected: #ifndef EXCEPTIONS_OFF /** Queries given interface for type rType. Throws a RuntimeException if the demanded interface cannot be queried. - + @param pInterface interface pointer @param rType interface type @return interface of demanded type @@ -86,54 +86,54 @@ protected: inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ); #endif - + public: /** Gets interface pointer. This call does not acquire the interface. - + @return UNacquired interface pointer */ inline XInterface * SAL_CALL get() const SAL_THROW( () ) { return _pInterface; } - + /** Checks if reference is null. - + @return true if reference acquires an interface, i.e. true if it is not null */ inline sal_Bool SAL_CALL is() const SAL_THROW( () ) { return (0 != _pInterface); } - + /** Equality operator: compares two interfaces Checks if both references are null or refer to the same object. - + @param rRef another interface @return true if both references are null or refer to the same object, false otherwise */ inline sal_Bool SAL_CALL operator == ( XInterface * pInterface ) const SAL_THROW( () ); /** Unequality operator: compares two interfaces Checks if both references are null or refer to the same object. - + @param rRef another interface @return false if both references are null or refer to the same object, true otherwise */ inline sal_Bool SAL_CALL operator != ( XInterface * pInterface ) const SAL_THROW( () ); - + /** Equality operator: compares two interfaces Checks if both references are null or refer to the same object. - + @param rRef another reference @return true if both references are null or refer to the same object, false otherwise */ inline sal_Bool SAL_CALL operator == ( const BaseReference & rRef ) const SAL_THROW( () ); /** Unequality operator: compares two interfaces Checks if both references are null or refer to the same object. - + @param rRef another reference @return false if both references are null or refer to the same object, true otherwise */ inline sal_Bool SAL_CALL operator != ( const BaseReference & rRef ) const SAL_THROW( () ); /** Needed by some STL containers. - + @param rRef another reference @return true, if this reference is less than rRef */ @@ -183,7 +183,7 @@ template< class interface_type > class Reference : public BaseReference { /** Queries given interface for type interface_type. - + @param pInterface interface pointer @return interface of demanded type (may be null) */ @@ -192,14 +192,14 @@ class Reference : public BaseReference #ifndef EXCEPTIONS_OFF /** Queries given interface for type interface_type. Throws a RuntimeException if the demanded interface cannot be queried. - + @param pInterface interface pointer @return interface of demanded type */ inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface ) SAL_THROW( (RuntimeException) ); /** Returns the given interface if it is not <NULL/>, throws a RuntimeException otherwise. - + @param pInterface interface pointer @return pInterface */ @@ -236,7 +236,7 @@ class Reference : public BaseReference static inline XInterface * castToXInterface(interface_type * p) { return static_cast< XInterface * >(static_cast< void * >(p)); } - + public: // these are here to force memory de/allocation to sal lib. /** @internal */ @@ -251,55 +251,55 @@ public: /** @internal */ inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) {} - + /** Destructor: Releases interface if set. */ inline ~Reference() SAL_THROW( () ); - + /** Default Constructor: Sets null reference. */ inline Reference() SAL_THROW( () ); - + /** Copy constructor: Copies interface reference. - + @param rRef another reference */ inline Reference( const Reference< interface_type > & rRef ) SAL_THROW( () ); /** Constructor: Sets given interface pointer. - + @param pInterface an interface pointer */ inline Reference( interface_type * pInterface ) SAL_THROW( () ); - + /** Constructor: Sets given interface pointer without acquiring it. - + @param pInterface another reference @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors */ inline Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW( () ); /** Constructor: Sets given interface pointer without acquiring it. Deprecated, please use SAL_NO_ACQUIRE version. - + @deprecated @param pInterface another reference @param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors */ inline Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ); - + /** Constructor: Queries given interface for reference interface type (interface_type). - + @param rRef another reference @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to other constructors */ inline Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). - + @param pInterface an interface pointer @param dummy UNO_QUERY to force obvious distinction to other constructors */ inline Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given any for reference interface type (interface_type). - + @param rAny an any @param dummy UNO_QUERY to force obvious distinction to other constructors */ @@ -307,7 +307,7 @@ public: #ifndef EXCEPTIONS_OFF /** Constructor: Queries given interface for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. - + @param rRef another reference @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to other constructors @@ -315,7 +315,7 @@ public: inline Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. - + @param pInterface an interface pointer @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to other constructors @@ -323,7 +323,7 @@ public: inline Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given any for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. - + @param rAny an any @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to other constructors @@ -348,47 +348,47 @@ public: */ inline Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ); #endif - + /** Cast operator to Reference< XInterface >: Reference objects are binary compatible and any interface must be derived from com.sun.star.uno.XInterface. This a useful direct cast possibility. */ inline SAL_CALL operator const Reference< XInterface > & () const SAL_THROW( () ) { return * reinterpret_cast< const Reference< XInterface > * >( this ); } - + /** Dereference operator: Used to call interface methods. - + @return UNacquired interface pointer */ inline interface_type * SAL_CALL operator -> () const SAL_THROW( () ) { return castFromXInterface(_pInterface); } - + /** Gets interface pointer. This call does not acquire the interface. - + @return UNacquired interface pointer */ inline interface_type * SAL_CALL get() const SAL_THROW( () ) { return castFromXInterface(_pInterface); } - + /** Clears reference, i.e. releases interface. Reference is null after clear() call. */ - inline void SAL_CALL clear() SAL_THROW( () ); - + inline void SAL_CALL clear() SAL_THROW( () ); + /** Sets the given interface. An interface already set will be released. - + @param rRef another reference @return true, if non-null interface was set */ inline sal_Bool SAL_CALL set( const Reference< interface_type > & rRef ) SAL_THROW( () ); /** Sets the given interface. An interface already set will be released. - + @param pInterface another interface @return true, if non-null interface was set */ inline sal_Bool SAL_CALL set( interface_type * pInterface ) SAL_THROW( () ); - + /** Sets interface pointer without acquiring it. An interface already set will be released. - + @param pInterface an interface pointer @param dummy SAL_NO_ACQUIRE to force obvious distinction to set methods @return true, if non-null interface was set @@ -403,10 +403,10 @@ public: @return true, if non-null interface was set */ inline sal_Bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ); - + /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. - + @param pInterface an interface pointer @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to set methods @return true, if non-null interface was set @@ -414,16 +414,16 @@ public: inline sal_Bool SAL_CALL set( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ); /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. - + @param rRef another reference @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to set methods @return true, if non-null interface was set */ inline sal_Bool SAL_CALL set( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ); - + /** Queries given any for reference interface type (interface_type) and sets it. An interface already set will be released. - + @param rAny an Any containing an interface @param dummy @@ -433,12 +433,12 @@ public: true, if non-null interface was set */ inline bool set( Any const & rAny, UnoReference_Query ); - + #ifndef EXCEPTIONS_OFF /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. Throws a RuntimeException if the demanded interface cannot be set. - + @param pInterface an interface pointer @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to set methods @@ -447,17 +447,17 @@ public: /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. Throws a RuntimeException if the demanded interface cannot be set. - + @param rRef another reference @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to set methods */ inline void SAL_CALL set( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); - + /** Queries given any for reference interface type (interface_type) and sets it. An interface already set will be released. Throws a RuntimeException if the demanded interface cannot be set. - + @param rAny an Any containing an interface @param dummy @@ -468,7 +468,7 @@ public: /** sets the given interface An interface already set will be released. Throws a RuntimeException if the source interface is <NULL/>. - + @param pInterface an interface pointer @param dummy UNO_SET_THROW to force obvious distinction to other set methods @@ -478,39 +478,39 @@ public: /** sets the given interface An interface already set will be released. Throws a RuntimeException if the source interface is <NULL/>. - + @param rRef an interface reference @param dummy UNO_SET_THROW to force obvious distinction to other set methods @since UDK 3.2.8 */ inline void SAL_CALL set( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ); - + #endif - + /** Assignment operator: Acquires given interface pointer and sets reference. An interface already set will be released. - + @param pInterface an interface pointer @return this reference */ inline Reference< interface_type > & SAL_CALL operator = ( interface_type * pInterface ) SAL_THROW( () ); /** Assignment operator: Acquires given interface reference and sets reference. An interface already set will be released. - + @param rRef an interface reference @return this reference */ inline Reference< interface_type > & SAL_CALL operator = ( const Reference< interface_type > & rRef ) SAL_THROW( () ); - + /** Queries given interface reference for type interface_type. - + @param rRef interface reference @return interface reference of demanded type (may be null) */ inline static Reference< interface_type > SAL_CALL query( const BaseReference & rRef ) SAL_THROW( (RuntimeException) ); /** Queries given interface for type interface_type. - + @param pInterface interface pointer @return interface reference of demanded type (may be null) */ diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx index 39e9614f20d8..d2a16a149a47 100644 --- a/cppu/inc/com/sun/star/uno/Reference.hxx +++ b/cppu/inc/com/sun/star/uno/Reference.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,11 +34,11 @@ #include <com/sun/star/uno/genfunc.hxx> namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno { diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h index 942050866eae..8b6cda8f322e 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.h +++ b/cppu/inc/com/sun/star/uno/Sequence.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,19 +44,19 @@ class ByteSequence; } namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno -{ +{ /** Template C++ class representing an IDL sequence. Template argument is the sequence element type. C++ Sequences are reference counted and shared, 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 */ template< class E > @@ -66,7 +66,7 @@ class Sequence @internal */ uno_Sequence * _pSequence; - + public: // these are here to force memory de/allocation to sal lib. /** @internal */ @@ -85,135 +85,135 @@ public: 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; - + /** typedefs the element type of the sequence */ typedef E ElementType; - + /** Default constructor: Creates an empty sequence. */ inline Sequence() SAL_THROW( () ); - + /** Copy constructor: Creates a copy of given sequence. - + @param rSeq another sequence of same type */ inline Sequence( const Sequence< E > & rSeq ) SAL_THROW( () ); - + /** Constructor: Takes over ownership of given sequence. - + @param pSequence a sequence @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors */ inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire ) SAL_THROW( () ); - + /** Constructor: Creates a copy of given elements. - + @param pElement an array of elements @param len length of array */ inline Sequence( const E * pElements, sal_Int32 len ); - + /** Constructor: Creates a default constructed sequence of given length. - + @param len initial sequence length */ inline Sequence( sal_Int32 len ); - + /** Destructor: Releases sequence handle. Last handle will destruct elements and free memory. */ inline ~Sequence() SAL_THROW( () ); - + /** Assignment operator: Acquires given sequence handle and releases previously set handle. - + @param rSeq another sequence of same type @return this sequence */ inline Sequence< E > & SAL_CALL operator = ( const Sequence< E > & rSeq ) SAL_THROW( () ); - + /** Gets length of the sequence. - + @return length of sequence */ inline sal_Int32 SAL_CALL getLength() const SAL_THROW( () ) { return _pSequence->nElements; } - + /** Tests whether the sequence has elements, i.e. elements count is greater than zero. - + @return true, if elements count is greater than zero */ inline sal_Bool SAL_CALL hasElements() const SAL_THROW( () ) { return (_pSequence->nElements > 0); } - + /** Gets a pointer to elements array for reading. If the sequence has a length of 0, then the returned pointer is undefined. - + @return pointer to elements array */ inline const E * SAL_CALL getConstArray() const SAL_THROW( () ) { return reinterpret_cast< const E * >( _pSequence->elements ); } - + /** Gets a pointer to elements array for reading and writing. In general if the sequence has a handle acquired by other sequences (reference count > 1), then a new sequence is created copy constructing all elements to keep value semantics! If the sequence has a length of 0, then the returned pointer is undefined. - + @return pointer to elements array */ inline E * SAL_CALL getArray(); - + /** Non-const index operator: Obtains a reference to element indexed at given position. The implementation does not check for array bounds! In general if the sequence has a handle acquired by other sequences (reference count > 1), then a new sequence is created copy constructing all elements to keep value semantics! - + @param nIndex index @return non-const C++ reference to element */ inline E & SAL_CALL operator [] ( sal_Int32 nIndex ); - + /** Const index operator: Obtains a reference to element indexed at given position. The implementation does not check for array bounds! - + @param nIndex index @return const C++ reference to element */ inline const E & SAL_CALL operator [] ( sal_Int32 nIndex ) const SAL_THROW( () ); - + /** Equality operator: Compares two sequences. - + @param rSeq another sequence of same type (right side) @return true if both sequences are equal, false otherwise */ inline sal_Bool SAL_CALL operator == ( const Sequence< E > & rSeq ) const SAL_THROW( () ); - + /** Unequality operator: Compares two sequences. - + @param rSeq another sequence of same type (right side) @return false if both sequences are equal, true otherwise */ inline sal_Bool SAL_CALL operator != ( const Sequence< E > & rSeq ) const SAL_THROW( () ); - + /** Reallocates sequence to new length. If the new length is smaller than the former, then upper elements will be destructed (and their memory freed). If the new length is greater @@ -221,13 +221,13 @@ public: If the sequence has a handle acquired by other sequences (reference count > 1), then the remaining elements are copy constructed to a new sequence handle to keep value semantics! - + @param nSize new size of sequence */ inline void SAL_CALL realloc( sal_Int32 nSize ); - + /** Provides UNacquired sequence handle. - + @return UNacquired sequence handle */ inline uno_Sequence * SAL_CALL get() const SAL_THROW( () ) @@ -235,7 +235,7 @@ public: }; /** Creates a UNO byte sequence from a SAL byte sequence. - + @param rByteSequence a byte sequence @return a UNO byte sequence */ @@ -251,7 +251,7 @@ 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 @return type of IDL sequence @@ -265,7 +265,7 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * ) This function has been introduced, because one cannot get the (templated) cppu type out of C++ array types. Array types have special getCppuArrayTypeN() functions. - + @attention the given element type must be the same as the template argument type! @tplparam E element type of sequence @@ -279,7 +279,7 @@ 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 @return type of IDL sequence< char > */ diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx index 8a9b43d1339e..ca94d0acbea9 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.hxx +++ b/cppu/inc/com/sun/star/uno/Sequence.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ #include "cppu/unotype.hxx" namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno { @@ -82,8 +82,8 @@ inline Sequence< E >::Sequence( const E * pElements, sal_Int32 len ) { const Type & rType = ::cppu::getTypeFavourUnsigned( this ); #if ! defined EXCEPTIONS_OFF - sal_Bool success = -#endif + sal_Bool success = +#endif ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), const_cast< E * >( pElements ), len, (uno_AcquireFunc)cpp_acquire ); @@ -99,8 +99,8 @@ inline Sequence< E >::Sequence( sal_Int32 len ) { const Type & rType = ::cppu::getTypeFavourUnsigned( this ); #if ! defined EXCEPTIONS_OFF - sal_Bool success = -#endif + sal_Bool success = +#endif ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), 0, len, (uno_AcquireFunc)cpp_acquire ); @@ -158,7 +158,7 @@ inline E * Sequence< E >::getArray() { const Type & rType = ::cppu::getTypeFavourUnsigned( this ); #if ! defined EXCEPTIONS_OFF - sal_Bool success = + sal_Bool success = #endif ::uno_type_sequence_reference2One( &_pSequence, rType.getTypeLibType(), @@ -197,7 +197,7 @@ inline void Sequence< E >::realloc( sal_Int32 nSize ) { const Type & rType = ::cppu::getTypeFavourUnsigned( this ); #if !defined EXCEPTIONS_OFF - sal_Bool success = + sal_Bool success = #endif ::uno_type_sequence_realloc( &_pSequence, rType.getTypeLibType(), nSize, diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h index 6490fa4ab7f1..56cf94aed642 100644 --- a/cppu/inc/com/sun/star/uno/Type.h +++ b/cppu/inc/com/sun/star/uno/Type.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _COM_SUN_STAR_UNO_TYPE_H_ #define _COM_SUN_STAR_UNO_TYPE_H_ - + #include <typelib/typedescription.h> #ifndef _COM_SUN_STAR_UNO_TYPECLASS_HDL_ #include <com/sun/star/uno/TypeClass.hdl> @@ -38,13 +38,13 @@ namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno -{ +{ /** Enum defining UNO_TYPE_NO_ACQUIRE for type description reference transfer. */ @@ -69,7 +69,7 @@ class Type @internal */ typelib_TypeDescriptionReference * _pType; - + public: // these are here to force memory de/allocation to sal lib. /** @internal */ @@ -84,118 +84,118 @@ public: /** @internal */ inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) {} - + /** Default Constructor: Type is set to void. */ inline Type() SAL_THROW( () ); - + /** Constructor: Type is constructed by given name and type class. - + @param eTypeClass type class of type @param rTypeName name of type */ inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () ); - + /** Constructor: Type is constructed by given name and type class. - + @param eTypeClass type class of type @param pTypeName name of type */ inline Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () ); - + /** Constructor: Type is (copy) constructed by given C type description reference. - + @param pType C type description reference */ inline Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () ); - + /** Constructor: Type is (copy) constructed by given C type description reference without acquiring it. - + @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( () ); /** 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( () ); - + /** Copy constructor: Type is copy constructed by given type. - + @param rType another type */ inline Type( const Type & rType ) SAL_THROW( () ); - + /** Destructor: Releases acquired C type description reference. */ inline ~Type() SAL_THROW( () ) { ::typelib_typedescriptionreference_release( _pType ); } - + /** Assignment operator: Acquires right side type and releases previously set type. - + @param rType another type (right side) @return this type */ inline Type & SAL_CALL operator = ( const Type & rType ) SAL_THROW( () ); - + /** Gets the type class of set type. - + @return type class of set type */ inline TypeClass SAL_CALL getTypeClass() const SAL_THROW( () ) { return (TypeClass)_pType->eTypeClass; } - + /** Gets the name of the set type. - + @return name of the set type */ inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW( () ); - + /** Obtains a full type description of set type. - + @param ppDescr [inout] type description */ inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const SAL_THROW( () ) { ::typelib_typedescriptionreference_getDescription( ppDescr, _pType ); } - + /** Gets the C typelib type description reference pointer. Does not acquire the reference! - + @return UNacquired type description reference */ inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const SAL_THROW( () ) { return _pType; } - + /** Tests if values of this reflected type can be assigned by values of given type. This includes widening conversion (e.g., long assignable from short), as long as there is no data loss. - + @param rType another type @return true if values of this type can be assigned from values of given type, false otherwise */ inline sal_Bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW( () ) { return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); } - + /** Compares two types. - + @param rType another type @return true if both types refer the same type, false otherwise */ inline sal_Bool SAL_CALL equals( const Type & rType ) const SAL_THROW( () ) { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); } /** Equality operator: Compares two types. - + @param rType another type @return true if both types refer the same type, false otherwise */ inline sal_Bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW( () ) { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); } /** Unequality operator: Compares two types. - + @param rType another type @return false if both types refer the same type, true otherwise */ @@ -221,7 +221,7 @@ 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 @return type of IDL type "type" */ @@ -232,35 +232,35 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::su */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () ); /** Gets the meta type of IDL type void. - + @return type of IDL type void */ inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () ); /** Gets the meta type of IDL type boolean. - + @return type of IDL type boolean */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () ); /** Gets the meta type of IDL type boolean. - + @return type of IDL type boolean */ inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () ); /** Gets the meta type of IDL type boolean. - + 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 @return type of IDL type boolean */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ); /** Gets the meta type of IDL type boolean. - + 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 @return type of IDL type boolean */ @@ -268,153 +268,153 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( bool const * ) SAL_THROW( () ); /** Gets the meta type of IDL type char. - + @return type of IDL type char */ inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () ); /** Gets the meta type of IDL type char. - + @return type of IDL type char */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () ); /** Gets the meta type of IDL type byte. - + 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 @return type of IDL type byte */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ); /** Gets the meta type of IDL type string. - + 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 @return type of IDL type string */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ); /** Gets the meta type of IDL type short. - + 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 @return type of IDL type short */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ); /** Gets the meta type of IDL type unsigned short. - + 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 @return type of IDL type unsigned short */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ); /** Gets the meta type of IDL type long. - + 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 @return type of IDL type long */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ); /** Gets the meta type of IDL type unsigned long. - + 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 @return type of IDL type unsigned long */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ); /** Gets the meta type of IDL type hyper. - + 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 @return type of IDL type hyper */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ); /** Gets the meta type of IDL type unsigned hyper. - + 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 @return type of IDL type unsigned hyper */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ); /** Gets the meta type of IDL type 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 @return type of IDL type float */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ); /** Gets the meta type of IDL type double. - + 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 @return type of IDL type double */ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ); /** Array template function to get meta type for one-dimensional arrays. - + @param pT array pointer @return type of array */ template< class T > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () ); /** Array template function to get meta type for two-dimensional arrays. - + @param pT array pointer @return type of array */ template< class T > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () ); /** Array template function to get meta type for three-dimensional arrays. - + @param pT array pointer @return type of array */ template< class T > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () ); /** Array template function to get meta type for four-dimensional arrays. - + @param pT array pointer @return type of array */ template< class T > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () ); /** Array template function to get meta type for five-dimensional arrays. - + @param pT array pointer @return type of array */ template< class T > inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () ); /** Array template function to get meta type for six-dimensional arrays. - + @param pT array pointer @return type of array */ diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx index 46fd86329424..83f7aff9789c 100644 --- a/cppu/inc/com/sun/star/uno/Type.hxx +++ b/cppu/inc/com/sun/star/uno/Type.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,11 +33,11 @@ #include "cppu/unotype.hxx" namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno { diff --git a/cppu/inc/com/sun/star/uno/genfunc.h b/cppu/inc/com/sun/star/uno/genfunc.h index 1b0dbd2c4cce..168a98fdcf04 100644 --- a/cppu/inc/com/sun/star/uno/genfunc.h +++ b/cppu/inc/com/sun/star/uno/genfunc.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,28 +33,28 @@ typedef struct _typelib_TypeDescriptionReference typelib_TypeDescriptionReference; namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno -{ +{ /** Function to acquire a C++ interface. - + @param pCppI C++ interface pointer */ inline void SAL_CALL cpp_acquire( void * pCppI ) SAL_THROW( () ); /** Function to release a C++ interface. - + @param pCppI C++ interface pointer */ inline void SAL_CALL cpp_release( void * pCppI ) SAL_THROW( () ); /** Function to query for a C++ interface. - + @param pCppI C++ interface pointer @param pType demanded interface type @return acquired C++ interface pointer or null diff --git a/cppu/inc/com/sun/star/uno/genfunc.hxx b/cppu/inc/com/sun/star/uno/genfunc.hxx index 88234bd81389..097fb87aef09 100644 --- a/cppu/inc/com/sun/star/uno/genfunc.hxx +++ b/cppu/inc/com/sun/star/uno/genfunc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,13 +33,13 @@ namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno -{ +{ //================================================================================================== inline void SAL_CALL cpp_acquire( void * pCppI ) diff --git a/cppu/inc/cppu/Enterable.hxx b/cppu/inc/cppu/Enterable.hxx index b378ca44e147..cf238edb0049 100644 --- a/cppu/inc/cppu/Enterable.hxx +++ b/cppu/inc/cppu/Enterable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include "uno/Enterable.h" #include "rtl/ustring.hxx" -namespace cppu +namespace cppu { /** C++ wrapper for binary C Enterable (http://wiki.services.openoffice.org/wiki/Uno/Cpp/Spec/Environment_Stack) @@ -74,15 +74,15 @@ private: extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); }; extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); }; -extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * pCallee, va_list * pParam) +extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * pCallee, va_list * pParam) { ((Enterable *)context)->v_callInto_v(pCallee, pParam); }; -extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam) +extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam) { ((Enterable *)context)->v_callOut_v(pCallee, pParam); }; extern "C" inline int Enterable_call_isValid (void * context, rtl_uString ** pReason) {return ((Enterable *)context)->v_isValid((rtl::OUString *)pReason);} -Enterable::Enterable(void) +Enterable::Enterable(void) { m_enter = Enterable_call_enter; m_leave = Enterable_call_leave; diff --git a/cppu/inc/cppu/EnvDcp.hxx b/cppu/inc/cppu/EnvDcp.hxx index 68adf63017c3..d35e8f2865c4 100644 --- a/cppu/inc/cppu/EnvDcp.hxx +++ b/cppu/inc/cppu/EnvDcp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,18 +33,18 @@ #include "uno/EnvDcp.h" -namespace cppu +namespace cppu { namespace EnvDcp { /** Get the OBI type part of an environment descriptor. (http://wiki.services.openoffice.org/wiki/Uno/Cpp/Spec/Environment_Descriptor) - + @param rEnvDcp the Environment Descriptor @return the OBI type @since UDK 3.2.7 */ -inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp) +inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp) { rtl::OUString typeName; @@ -55,7 +55,7 @@ inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp) /** Get the purpose part of an environment descriptor. (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor) - + @param rEnvDcp the Environment Descriptor @return the purpose @since UDK 3.2.7 diff --git a/cppu/inc/cppu/EnvGuards.hxx b/cppu/inc/cppu/EnvGuards.hxx index 07f65b2aced9..b03f54ff0c6b 100644 --- a/cppu/inc/cppu/EnvGuards.hxx +++ b/cppu/inc/cppu/EnvGuards.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,25 +59,25 @@ namespace cppu } } - ~EnvGuard() - { - m_env.enter(); + ~EnvGuard() + { + m_env.enter(); } /** Checks if the associated environment is non empty. - + @return 0 == empty, 1 == non empty */ sal_Bool SAL_CALL is() const SAL_THROW( () ) - { - return m_env.is(); + { + return m_env.is(); } /** Leaves the associated environment and clears the reference. */ - void clear() - { + void clear() + { if (m_env.is()) { m_env.enter(); @@ -104,12 +104,12 @@ namespace cppu uno_Environment_enter(NULL); } - ~AntiEnvGuard() - { + ~AntiEnvGuard() + { m_env.enter(); } }; -} +} #endif diff --git a/cppu/inc/cppu/FreeReference.hxx b/cppu/inc/cppu/FreeReference.hxx index 5a8d22175921..4a1ffb96889e 100644 --- a/cppu/inc/cppu/FreeReference.hxx +++ b/cppu/inc/cppu/FreeReference.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ namespace cppu FreeReference(FreeReference<T> const & rOther) : m_env (rOther.m_env), - m_pObject(rOther.m_pObject) + m_pObject(rOther.m_pObject) { if (m_pObject) m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject); @@ -118,7 +118,7 @@ namespace cppu { if (m_pObject) { - + m_env.get()->pExtEnv->releaseInterface(m_env.get()->pExtEnv, m_pObject); m_pObject = NULL; m_env.clear(); @@ -147,7 +147,7 @@ namespace cppu if (m_pObject) { m_env = cssuno::Environment::getCurrent(); - + m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject); } } @@ -162,7 +162,7 @@ namespace cppu return !operator==(rOther); } }; -} +} #endif diff --git a/cppu/inc/cppu/Map.hxx b/cppu/inc/cppu/Map.hxx index a5922f830b5d..c664806c3aef 100644 --- a/cppu/inc/cppu/Map.hxx +++ b/cppu/inc/cppu/Map.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace cppu template<class T> inline T * mapOut(T * pT, cssu::Environment const & outerEnv) { cssu::Mapping curr2outer(cssu::Environment::getCurrent(), outerEnv); - + return reinterpret_cast<T *>(curr2outer.mapInterface(pT, getCppuType((cssu::Reference<T> *)NULL))); } @@ -65,7 +65,7 @@ namespace cppu template<class T> inline T * mapIn(T * pT, cssu::Environment const & outerEnv) { cssu::Mapping outer2curr(outerEnv, cssu::Environment::getCurrent()); - + return reinterpret_cast<T *>(outer2curr.mapInterface(pT, getCppuType((cssu::Reference<T> *)NULL))); } @@ -81,7 +81,7 @@ namespace cppu inline void mapOutAny(cssu::Any const & any, cssu::Any * res, cssu::Environment const & outerEnv) { cssu::Mapping curr2outer(cssu::Environment::getCurrent(), outerEnv); - + uno_any_destruct(res, (uno_ReleaseFunc)cssu::cpp_release); uno_type_any_constructAndConvert( res, @@ -101,7 +101,7 @@ namespace cppu inline void mapInAny(cssu::Any const & any, cssu::Any * res, cssu::Environment const & outerEnv) { cssu::Mapping outer2curr(outerEnv, cssu::Environment::getCurrent()); - + uno_any_destruct(res, (uno_ReleaseFunc)cssu::cpp_release); uno_type_any_constructAndConvert( res, diff --git a/cppu/inc/cppu/Shield.hxx b/cppu/inc/cppu/Shield.hxx index 1e7221a210d3..2eb0f93ce7b8 100644 --- a/cppu/inc/cppu/Shield.hxx +++ b/cppu/inc/cppu/Shield.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace cppu { return mapIn(pT, cssu::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))))); } - + /** Maps an any from the current to the thread-safe Environment, fills the passed any. diff --git a/cppu/inc/cppu/helper/purpenv/Environment.hxx b/cppu/inc/cppu/helper/purpenv/Environment.hxx index 25c9de8e8a6e..1b96e2f3486b 100644 --- a/cppu/inc/cppu/helper/purpenv/Environment.hxx +++ b/cppu/inc/cppu/helper/purpenv/Environment.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/inc/cppu/helper/purpenv/Mapping.hxx b/cppu/inc/cppu/helper/purpenv/Mapping.hxx index 6bdcd207987f..27dd1e8e11cf 100644 --- a/cppu/inc/cppu/helper/purpenv/Mapping.hxx +++ b/cppu/inc/cppu/helper/purpenv/Mapping.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ void createMapping(uno_Mapping ** ppMapping, ProbeFun * probeFun = NULL, void * pContext = NULL ); - + }}} #endif diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx index 5c123e7aecd9..e62594b981ff 100644 --- a/cppu/inc/cppu/macros.hxx +++ b/cppu/inc/cppu/macros.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <uno/lbnames.h> /** Namespace name for compiler/ platform, e.g. gcc3, msci */ -#define CPPU_CURRENT_NAMESPACE CPPU_ENV +#define CPPU_CURRENT_NAMESPACE CPPU_ENV /** Patching the GCC 3 incomatible alignment change for Linux. @@ -62,6 +62,6 @@ #define CPPU_GCC_DLLPUBLIC_EXPORT SAL_EXCEPTION_DLLPUBLIC_EXPORT #define CPPU_GCC_DLLPRIVATE SAL_EXCEPTION_DLLPRIVATE -#endif // _CPPU_MACROS_HXX_ +#endif // _CPPU_MACROS_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/unotype.hxx b/cppu/inc/cppu/unotype.hxx index b8df4e07a1b0..6c176a05d617 100644 --- a/cppu/inc/cppu/unotype.hxx +++ b/cppu/inc/cppu/unotype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/inc/pch/precompiled_cppu.cxx b/cppu/inc/pch/precompiled_cppu.cxx index 2a6a6cb94ae0..0b9c5e7e876d 100644 --- a/cppu/inc/pch/precompiled_cppu.cxx +++ b/cppu/inc/pch/precompiled_cppu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/inc/pch/precompiled_cppu.hxx b/cppu/inc/pch/precompiled_cppu.hxx index c6624e57b5ca..e82823cb5416 100644 --- a/cppu/inc/pch/precompiled_cppu.hxx +++ b/cppu/inc/pch/precompiled_cppu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/inc/typelib/typeclass.h b/cppu/inc/typelib/typeclass.h index 231c9d9f5fe3..493f7425c9a5 100644 --- a/cppu/inc/typelib/typeclass.h +++ b/cppu/inc/typelib/typeclass.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h index 2758d0914ca9..c188261d2154 100644 --- a/cppu/inc/typelib/typedescription.h +++ b/cppu/inc/typelib/typedescription.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,76 +53,76 @@ typedef struct _typelib_TypeDescriptionReference /** reference count of type; don't ever modify this by yourself, use typelib_typedescriptionreference_acquire() and typelib_typedescriptionreference_release() */ - sal_Int32 nRefCount; + sal_Int32 nRefCount; /** number of static references of type, because of the fact that some types are needed until program termination and are commonly held static. */ - sal_Int32 nStaticRefCount; + sal_Int32 nStaticRefCount; /** type class of type */ - typelib_TypeClass eTypeClass; + typelib_TypeClass eTypeClass; /** fully qualified name of type - */ - rtl_uString * pTypeName; + */ + rtl_uString * pTypeName; /** pointer to full typedescription; this value is only valid if the type is never swapped out */ - struct _typelib_TypeDescription * pType; + struct _typelib_TypeDescription * pType; /** pointer to optimize the runtime; not for public use */ - void * pUniqueIdentifier; + void * pUniqueIdentifier; /** reserved for future use; 0 if not used */ - void * pReserved; + void * pReserved; } typelib_TypeDescriptionReference; /** Full type description of a type. Memory layout of this struct is identical to the typelib_TypeDescriptionReference for the first six members. - So a typedescription can be used as type reference. + So a typedescription can be used as type reference. */ typedef struct _typelib_TypeDescription { /** reference count; don't ever modify this by yourself, use typelib_typedescription_acquire() and typelib_typedescription_release() */ - sal_Int32 nRefCount; + sal_Int32 nRefCount; /** number of static references of type, because of the fact that some types are needed until program termination and are commonly held static. */ - sal_Int32 nStaticRefCount; + sal_Int32 nStaticRefCount; /** type class of type */ - typelib_TypeClass eTypeClass; + typelib_TypeClass eTypeClass; /** fully qualified name of type - */ - rtl_uString * pTypeName; + */ + rtl_uString * pTypeName; /** pointer to self to distinguish reference from description; for internal use only */ - struct _typelib_TypeDescription * pSelf; + struct _typelib_TypeDescription * pSelf; /** pointer to optimize the runtime; not for public use */ - void * pUniqueIdentifier; + void * pUniqueIdentifier; /** reserved for future use; 0 if not used */ - void * pReserved; - + void * pReserved; + /** flag to determine whether the description is complete: compound and union types lack of member names, enums lack of member types and names, interfaces lack of members and table init. Call typelib_typedescription_complete() if false. */ - sal_Bool bComplete; + sal_Bool bComplete; /** size of type */ - sal_Int32 nSize; + sal_Int32 nSize; /** alignment of type */ - sal_Int32 nAlignment; + sal_Int32 nAlignment; /** pointer to weak reference */ - typelib_TypeDescriptionReference * pWeakRef; + typelib_TypeDescriptionReference * pWeakRef; /** determines, if type can be unloaded (and it is possible to reloaded it) */ - sal_Bool bOnDemand; + sal_Bool bOnDemand; } typelib_TypeDescription; /** Type description for exception types. @@ -131,24 +131,24 @@ typedef struct _typelib_CompoundTypeDescription { /** inherits all members of typelib_TypeDescription */ - typelib_TypeDescription aBase; - + typelib_TypeDescription aBase; + /** pointer to base type description, else 0 */ struct _typelib_CompoundTypeDescription * pBaseTypeDescription; - + /** number of members */ - sal_Int32 nMembers; + sal_Int32 nMembers; /** byte offsets of each member including the size the base type */ - sal_Int32 * pMemberOffsets; + sal_Int32 * pMemberOffsets; /** members of the struct or exception */ - typelib_TypeDescriptionReference ** ppTypeRefs; + typelib_TypeDescriptionReference ** ppTypeRefs; /** member names of the struct or exception */ - rtl_uString ** ppMemberNames; + rtl_uString ** ppMemberNames; } typelib_CompoundTypeDescription; /** @@ -182,33 +182,33 @@ typedef struct _typelib_UnionTypeDescription { /** inherits all members of typelib_TypeDescription */ - typelib_TypeDescription aBase; - + typelib_TypeDescription aBase; + /** type of the discriminant */ - typelib_TypeDescriptionReference * pDiscriminantTypeRef; - + typelib_TypeDescriptionReference * pDiscriminantTypeRef; + /** union default descriminant */ - sal_Int64 nDefaultDiscriminant; + sal_Int64 nDefaultDiscriminant; /** union default member type (may be 0) */ - typelib_TypeDescriptionReference * pDefaultTypeRef; + typelib_TypeDescriptionReference * pDefaultTypeRef; /** number of union member types */ - sal_Int32 nMembers; + sal_Int32 nMembers; /** union member discriminant values (same order as idl declaration) */ - sal_Int64 * pDiscriminants; + sal_Int64 * pDiscriminants; /** union member value types (same order as idl declaration) */ - typelib_TypeDescriptionReference ** ppTypeRefs; + typelib_TypeDescriptionReference ** ppTypeRefs; /** union member value names (same order as idl declaration) */ - rtl_uString ** ppMemberNames; + rtl_uString ** ppMemberNames; /** union value offset for data access */ - sal_Int32 nValueOffset; + sal_Int32 nValueOffset; } typelib_UnionTypeDescription; /** Type description of an array or sequence. @@ -217,11 +217,11 @@ typedef struct _typelib_IndirectTypeDescription { /** inherits all members of typelib_TypeDescription */ - typelib_TypeDescription aBase; - + typelib_TypeDescription aBase; + /** array, sequence: pointer to element type */ - typelib_TypeDescriptionReference * pType; + typelib_TypeDescriptionReference * pType; } typelib_IndirectTypeDescription; /** Type description of an array. @@ -230,17 +230,17 @@ typedef struct _typelib_ArrayTypeDescription { /** inherits all members of typelib_IndirectTypeDescription */ - typelib_IndirectTypeDescription aBase; - + typelib_IndirectTypeDescription aBase; + /** number of dimensions */ - sal_Int32 nDimensions; + sal_Int32 nDimensions; /** number of total array elements */ - sal_Int32 nTotalElements; + sal_Int32 nTotalElements; /** array of dimensions */ - sal_Int32 * pDimensions; + sal_Int32 * pDimensions; } typelib_ArrayTypeDescription; /** Type description of an enum. The type class of this description is typelib_TypeClass_ENUM. @@ -249,20 +249,20 @@ typedef struct _typelib_EnumTypeDescription { /** inherits all members of typelib_TypeDescription */ - typelib_TypeDescription aBase; - + typelib_TypeDescription aBase; + /** first value of the enum */ - sal_Int32 nDefaultEnumValue; + sal_Int32 nDefaultEnumValue; /** number of enum values */ - sal_Int32 nEnumValues; + sal_Int32 nEnumValues; /** names of enum values */ - rtl_uString ** ppEnumNames; + rtl_uString ** ppEnumNames; /** values of enum (corresponding to names in similar order) */ - sal_Int32 * pEnumValues; + sal_Int32 * pEnumValues; } typelib_EnumTypeDescription; /** Description of an interface method parameter. @@ -271,18 +271,18 @@ typedef struct _typelib_MethodParameter { /** name of parameter */ - rtl_uString * pName; + rtl_uString * pName; /** type of parameter */ - typelib_TypeDescriptionReference * pTypeRef; + typelib_TypeDescriptionReference * pTypeRef; /** true: the call type of this parameter is [in] or [inout] false: the call type of this parameter is [out] */ - sal_Bool bIn; + sal_Bool bIn; /** true: the call type of this parameter is [out] or [inout] false: the call type of this parameter is [in] */ - sal_Bool bOut; + sal_Bool bOut; } typelib_MethodParameter; /** Common base type description of typelib_InterfaceMethodTypeDescription and @@ -292,15 +292,15 @@ typedef struct _typelib_InterfaceMemberTypeDescription { /** inherits all members of typelib_TypeDescription */ - typelib_TypeDescription aBase; - + typelib_TypeDescription aBase; + /** position of member in the interface including the number of members of any base interfaces */ - sal_Int32 nPosition; + sal_Int32 nPosition; /** name of member */ - rtl_uString * pMemberName; + rtl_uString * pMemberName; } typelib_InterfaceMemberTypeDescription; /** Type description of an interface method. The type class of this description is @@ -310,26 +310,26 @@ typedef struct _typelib_InterfaceMethodTypeDescription { /** inherits all members of typelib_InterfaceMemberTypeDescription */ - typelib_InterfaceMemberTypeDescription aBase; - + typelib_InterfaceMemberTypeDescription aBase; + /** type of the return value */ - typelib_TypeDescriptionReference * pReturnTypeRef; + typelib_TypeDescriptionReference * pReturnTypeRef; /** number of parameters */ - sal_Int32 nParams; + sal_Int32 nParams; /** array of parameters */ - typelib_MethodParameter * pParams; + typelib_MethodParameter * pParams; /** number of exceptions */ - sal_Int32 nExceptions; + sal_Int32 nExceptions; /** array of exception types */ - typelib_TypeDescriptionReference ** ppExceptions; + typelib_TypeDescriptionReference ** ppExceptions; /** determines whether method is declared oneway */ - sal_Bool bOneWay; + sal_Bool bOneWay; /** the interface description this method is a member of @@ -359,14 +359,14 @@ typedef struct _typelib_InterfaceAttributeTypeDescription { /** inherits all members of typelib_InterfaceMemberTypeDescription */ - typelib_InterfaceMemberTypeDescription aBase; - + typelib_InterfaceMemberTypeDescription aBase; + /** determines whether attribute is read only */ - sal_Bool bReadOnly; + sal_Bool bReadOnly; /** type of the attribute */ - typelib_TypeDescriptionReference * pAttributeTypeRef; + typelib_TypeDescriptionReference * pAttributeTypeRef; /** the interface description this attribute is a member of @@ -442,39 +442,39 @@ typedef struct _typelib_InterfaceTypeDescription { /** inherits all members of typelib_TypeDescription */ - typelib_TypeDescription aBase; - + typelib_TypeDescription aBase; + /** pointer to base type description, else 0 @deprecated use nBaseTypes and ppBaseTypes instead */ - struct _typelib_InterfaceTypeDescription * pBaseTypeDescription; + struct _typelib_InterfaceTypeDescription * pBaseTypeDescription; /** unique identifier of interface */ - typelib_Uik aUik; + typelib_Uik aUik; /** number of members */ - sal_Int32 nMembers; + sal_Int32 nMembers; /** array of members; references attributes or methods */ - typelib_TypeDescriptionReference ** ppMembers; + typelib_TypeDescriptionReference ** ppMembers; /** number of members including members of base interface */ - sal_Int32 nAllMembers; + sal_Int32 nAllMembers; /** array of members including members of base interface; references attributes or methods */ - typelib_TypeDescriptionReference ** ppAllMembers; + typelib_TypeDescriptionReference ** ppAllMembers; /** array mapping index of the member description to an index doubling for read-write attributes (called function index); size of array is nAllMembers */ - sal_Int32 * pMapMemberIndexToFunctionIndex; + sal_Int32 * pMapMemberIndexToFunctionIndex; /** number of members plus number of read-write attributes */ - sal_Int32 nMapFunctionIndexToMemberIndex; + sal_Int32 nMapFunctionIndexToMemberIndex; /** array mapping function index to member index; size of arry is nMapFunctionIndexToMemberIndex */ - sal_Int32 * pMapFunctionIndexToMemberIndex; + sal_Int32 * pMapFunctionIndexToMemberIndex; /** number of base types @since UDK 3.2.0 @@ -493,16 +493,16 @@ typedef struct _typelib_CompoundMember_Init { /** type class of compound member */ - typelib_TypeClass eTypeClass; + typelib_TypeClass eTypeClass; /** name of type of compound member For a member of an instantiated polymorphic struct type that is of parameterized type, this will be a null pointer. */ - rtl_uString * pTypeName; + rtl_uString * pTypeName; /** name of compound member */ - rtl_uString * pMemberName; + rtl_uString * pMemberName; } typelib_CompoundMember_Init; /** @@ -530,19 +530,19 @@ typedef struct _typelib_Parameter_Init { /** type class of parameter */ - typelib_TypeClass eTypeClass; + typelib_TypeClass eTypeClass; /** name of parameter */ - rtl_uString * pTypeName; + rtl_uString * pTypeName; /** name of parameter */ - rtl_uString * pParamName; + rtl_uString * pParamName; /** true, if parameter is [in] or [inout] */ - sal_Bool bIn; + sal_Bool bIn; /** true, if parameter is [out] or [inout] */ - sal_Bool bOut; + sal_Bool bOut; } typelib_Parameter_Init; /** Init struct of union types for typelib_typedescription_newUnion(). @@ -551,10 +551,10 @@ typedef struct _typelib_Union_Init { /** union member discriminant */ - sal_Int64 nDiscriminant; + sal_Int64 nDiscriminant; /** union member name */ - rtl_uString * pMemberName; + rtl_uString * pMemberName; /** union member type */ typelib_TypeDescriptionReference* pTypeRef; @@ -567,7 +567,7 @@ typedef struct _typelib_Union_Init /** Creates a union type description. All discriminants are handled as int64 values. The pDiscriminantTypeRef must be of type byte, short, ..., up to hyper. - + @param ppRet inout union type description @param pTypeName name of union type @param pDiscriminantTypeRef discriminant type @@ -587,7 +587,7 @@ void SAL_CALL typelib_typedescription_newUnion( SAL_THROW_EXTERN_C(); /** Creates an enum type description. - + @param ppRet inout enum type description @param pTypeName name of enum @param nDefaultEnumValue default enum value @@ -605,7 +605,7 @@ void SAL_CALL typelib_typedescription_newEnum( SAL_THROW_EXTERN_C(); /** Creates an array type description. - + @param ppRet inout enum type description @param pElementTypeRef element type @param nDimensions number of dimensions @@ -643,7 +643,7 @@ void SAL_CALL typelib_typedescription_new( SAL_THROW_EXTERN_C(); /** Creates a new struct type description. - + @param ppRet inout type description @param pTypeName name of type @param pType base type; @@ -661,7 +661,7 @@ void SAL_CALL typelib_typedescription_newStruct( SAL_THROW_EXTERN_C(); /** Creates an interface type description. - + @param ppRet inout interface type description @param pTypeName the fully qualified name of the interface. @param nUik1 uik part @@ -686,7 +686,7 @@ void SAL_CALL typelib_typedescription_newInterface( SAL_THROW_EXTERN_C(); /** Creates a multiple-inheritance interface type description. - + @param ppRet inout interface type description @param pTypeName the fully qualified name of the interface. @param nUik1 uik part @@ -712,7 +712,7 @@ void SAL_CALL typelib_typedescription_newMIInterface( SAL_THROW_EXTERN_C(); /** Creates an interface method type description. - + @param ppRet inout method type description @param nAbsolutePosition position of member including all members of base interfaces @param bOneWay determines whether method is declared oneway @@ -738,7 +738,7 @@ void SAL_CALL typelib_typedescription_newInterfaceMethod( SAL_THROW_EXTERN_C(); /** Creates an interface attribute type description. - + @param ppRet inout attribute type description @param nAbsolutePosition position of this attribute including all members of base interfaces @param pAttributeName fully qualified name of attribute including interface @@ -760,7 +760,7 @@ void SAL_CALL typelib_typedescription_newInterfaceAttribute( SAL_THROW_EXTERN_C(); /** Creates an extended interface attribute type description. - + @param ppRet inout attribute type description @param nAbsolutePosition position of this attribute including all members of base interfaces @@ -788,7 +788,7 @@ void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( SAL_THROW_EXTERN_C(); /** Increments reference count of given type description. - + @param pDesc type description */ void SAL_CALL typelib_typedescription_acquire( @@ -797,7 +797,7 @@ void SAL_CALL typelib_typedescription_acquire( /** Decrements reference count of given type. If reference count reaches 0, the trype description is deleted. - + @param pDesc type description */ void SAL_CALL typelib_typedescription_release( @@ -806,15 +806,15 @@ void SAL_CALL typelib_typedescription_release( /** Registers a type description and creates a type description reference. Type descriptions will be registered automatically if they are provided via the callback chain. - - @param ppNewDescription inout description to be registered; + + @param ppNewDescription inout description to be registered; */ void SAL_CALL typelib_typedescription_register( typelib_TypeDescription ** ppNewDescription ) SAL_THROW_EXTERN_C(); /** Tests whether two types descriptions are equal, i.e. type class and names are equal. - + @param p1 a type description @param p2 another type description @return true, if type descriptions are equal @@ -824,7 +824,7 @@ sal_Bool SAL_CALL typelib_typedescription_equals( SAL_THROW_EXTERN_C(); /** Retrieves a type description via its fully qualified name. - + @param ppRet inout type description; *ppRet is 0, if type description was not found @param pName name demanded type description */ @@ -833,7 +833,7 @@ void SAL_CALL typelib_typedescription_getByName( SAL_THROW_EXTERN_C(); /** Sets size of type description cache. - + @param nNewSize new size of cache */ void SAL_CALL typelib_setCacheSize( @@ -842,8 +842,8 @@ void SAL_CALL typelib_setCacheSize( /** Function pointer declaration of callback function get additional descriptions. Callbacks must provide complete type descriptions (see typelib_typedescription_complete())! - - @param pContext callback context + + @param pContext callback context @param ppRet inout type description @param pTypeName name of demanded type description */ @@ -851,8 +851,8 @@ typedef void (SAL_CALL * typelib_typedescription_Callback)( void * pContext, typelib_TypeDescription ** ppRet, rtl_uString * pTypeName ); /** Registers callback function providing additional type descriptions. - - @param pContext callback context + + @param pContext callback context @param pCallback callback function */ void SAL_CALL typelib_typedescription_registerCallback( @@ -860,8 +860,8 @@ void SAL_CALL typelib_typedescription_registerCallback( SAL_THROW_EXTERN_C(); /** Revokes a previously registered callback function. - - @param pContext callback context + + @param pContext callback context @param pCallback registered callback function */ void SAL_CALL typelib_typedescription_revokeCallback( @@ -880,7 +880,7 @@ void SAL_CALL typelib_typedescription_revokeCallback( description is not initialized. @internal */ -#define TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass ) \ +#define TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass ) \ ((eTypeClass) == typelib_TypeClass_INTERFACE_METHOD || \ (eTypeClass) == typelib_TypeClass_INTERFACE_ATTRIBUTE) @@ -920,12 +920,12 @@ void SAL_CALL typelib_typedescription_revokeCallback( /** 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. - + @param ppTDR inout type description reference @param eTypeClass type class of type @param pTypeName name of type */ -void SAL_CALL typelib_typedescriptionreference_new( +void SAL_CALL typelib_typedescriptionreference_new( typelib_TypeDescriptionReference ** ppTDR, typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) @@ -933,7 +933,7 @@ void SAL_CALL typelib_typedescriptionreference_new( /** 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. - + @param ppTDR inout type description reference @param eTypeClass type class of type @param pTypeName ascii name of type @@ -945,7 +945,7 @@ void SAL_CALL typelib_typedescriptionreference_newByAsciiName( SAL_THROW_EXTERN_C(); /** Increments reference count of type description reference. - + @param pRef type description reference */ void SAL_CALL typelib_typedescriptionreference_acquire( @@ -954,7 +954,7 @@ void SAL_CALL typelib_typedescriptionreference_acquire( /** Increments reference count of type description reference. If the reference count reaches 0, then the reference is deleted. - + @param pRef type description reference */ void SAL_CALL typelib_typedescriptionreference_release( @@ -963,7 +963,7 @@ void SAL_CALL typelib_typedescriptionreference_release( /** Retrieves the type description for a given reference. If it is not possible to resolve the reference, null is returned. - + @param ppRet inout type description */ void SAL_CALL typelib_typedescriptionreference_getDescription( @@ -971,7 +971,7 @@ void SAL_CALL typelib_typedescriptionreference_getDescription( SAL_THROW_EXTERN_C(); /** Tests whether two types description references are equal, i.e. type class and names are equal. - + @param p1 a type description reference @param p2 another type description reference @return true, if type description references are equal @@ -981,7 +981,7 @@ sal_Bool SAL_CALL typelib_typedescriptionreference_equals( SAL_THROW_EXTERN_C(); /** Assigns a type. - + @param ppDest destination type @param pSource source type */ @@ -992,7 +992,7 @@ void SAL_CALL typelib_typedescriptionreference_assign( /** Tests if values of type pAssignable can be assigned by values of type pFrom. This includes widening conversion (e.g., long assignable from short), as long as there is no data loss. - + @param pAssignable type description of value to be assigned @param pFrom type description of value */ @@ -1003,7 +1003,7 @@ sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom( /** Tests if values of type pAssignable can be assigned by values of type pFrom. This includes widening conversion (e.g., long assignable from short), as long as there is no data loss. - + @param pAssignable type of value to be assigned @param pFrom type of value */ @@ -1015,9 +1015,9 @@ sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom( /** Gets static type reference of standard types by type class. ADDITIONAL OPT: provides Type com.sun.star.uno.Exception for typelib_TypeClass_EXCEPTION and com.sun.star.uno.XInterface for typelib_TypeClass_INTERFACE. - + Thread synchronizes on typelib mutex. - + @param eTypeClass type class of basic type @return pointer to type reference pointer */ @@ -1026,7 +1026,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( SAL_THROW_EXTERN_C(); /** Inits static type reference. Thread synchronizes on typelib init mutex. - + @param ppRef pointer to type reference pointer @param eTypeClass type class of type @param pTypeName ascii name of type @@ -1037,7 +1037,7 @@ void SAL_CALL typelib_static_type_init( SAL_THROW_EXTERN_C(); /** Inits static sequence type reference. Thread synchronizes on typelib init mutex. - + @param ppRef pointer to type reference pointer @param pElementType element type of sequence */ @@ -1047,7 +1047,7 @@ void SAL_CALL typelib_static_sequence_type_init( SAL_THROW_EXTERN_C (); /** Inits static array type reference. Thread synchronizes on typelib init mutex. - + @param ppRef pointer to type reference pointer @param pElementType element type of sequence @param nDimensions number of dimensions @@ -1102,7 +1102,7 @@ void SAL_CALL typelib_static_struct_type_init( SAL_THROW_EXTERN_C(); /** Inits incomplete static interface type reference. Thread synchronizes on typelib init mutex. - + @param ppRef pointer to type reference pointer @param pTypeName name of interface @param pBaseType base type @@ -1131,7 +1131,7 @@ void SAL_CALL typelib_static_mi_interface_type_init( SAL_THROW_EXTERN_C(); /** Inits incomplete static enum type reference. Thread synchronizes on typelib init mutex. - + @param ppRef pointer to type reference pointer @param pTypeName name of enum @param nDefaultEnumValue default enum value @@ -1146,7 +1146,7 @@ void SAL_CALL typelib_static_enum_type_init( INTERFACE and ENUM type descriptions may be partly initialized (see typelib_static_...(), typelib_TypeDescription::bComplete). For interface type descriptions, this will also init index tables. - + @param ppTypeDescr [inout] type description to be completed (may be exchanged!) @return true, if type description is complete */ diff --git a/cppu/inc/typelib/typedescription.hxx b/cppu/inc/typelib/typedescription.hxx index 3997f3d9c14d..20ce773356e7 100644 --- a/cppu/inc/typelib/typedescription.hxx +++ b/cppu/inc/typelib/typedescription.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,11 +35,11 @@ namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno { @@ -53,7 +53,7 @@ class TypeDescription /** C typelib type description */ mutable typelib_TypeDescription * _pTypeDescr; - + public: // these are here to force memory de/allocation to sal lib. /** @internal */ @@ -68,34 +68,34 @@ public: /** @internal */ inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) {} - + /** Constructor: - + @param pTypeDescr a type description */ inline TypeDescription( typelib_TypeDescription * pTypeDescr = 0 ) SAL_THROW( () ); /** Constructor: - + @param pTypeDescrRef a type description reference */ inline TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW( () ); /** Constructor: - + @param rType a type */ inline TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW( () ); /** Copy constructor: - + @param rDescr another TypeDescription */ inline TypeDescription( const TypeDescription & rDescr ) SAL_THROW( () ); /** Constructor: - + @param pTypeName a type name */ inline TypeDescription( rtl_uString * pTypeName ) SAL_THROW( () ); /** Constructor: - + @param rTypeName a type name */ inline TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW( () ); @@ -104,13 +104,13 @@ public: inline ~TypeDescription() SAL_THROW( () ); /** Assignment operator: acquires given type description and releases a set one. - + @param pTypeDescr another type description @return this TypeDescription */ inline TypeDescription & SAL_CALL operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ); /** Assignment operator: acquires given type description and releases a set one. - + @param rTypeDescr another type description @return this TypeDescription */ @@ -118,13 +118,13 @@ public: { return this->operator =( rTypeDescr.get() ); } /** Tests whether two type descriptions are equal. - + @param pTypeDescr another type description @return true, if both type descriptions are equal, false otherwise */ inline sal_Bool SAL_CALL equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ); /** Tests whether two type descriptions are equal. - + @param rTypeDescr another type description @return true, if both type descriptions are equal, false otherwise */ @@ -134,15 +134,15 @@ public: /** Makes stored type description complete. */ inline void SAL_CALL makeComplete() const SAL_THROW( () ); - + /** Gets the UNacquired type description pointer. - + @return stored pointer of type description */ inline typelib_TypeDescription * SAL_CALL get() const SAL_THROW( () ) { return _pTypeDescr; } /** Tests if a type description is set. - + @return true, if a type description is set, false otherwise */ inline sal_Bool SAL_CALL is() const SAL_THROW( () ) diff --git a/cppu/inc/typelib/uik.h b/cppu/inc/typelib/uik.h index 026d376da9f2..d8ed652e4737 100644 --- a/cppu/inc/typelib/uik.h +++ b/cppu/inc/typelib/uik.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,15 +40,15 @@ */ typedef struct _typelib_Uik { - sal_uInt32 m_Data1; - sal_uInt16 m_Data2; - sal_uInt16 m_Data3; - sal_uInt32 m_Data4; - sal_uInt32 m_Data5; + sal_uInt32 m_Data1; + sal_uInt16 m_Data2; + sal_uInt16 m_Data3; + sal_uInt32 m_Data4; + sal_uInt32 m_Data5; } typelib_Uik; #if defined( SAL_W32) || defined(SAL_OS2) -# pragma pack(pop) +# pragma pack(pop) #endif #endif diff --git a/cppu/inc/uno/Enterable.h b/cppu/inc/uno/Enterable.h index a769ede987f2..a4258c092d75 100644 --- a/cppu/inc/uno/Enterable.h +++ b/cppu/inc/uno/Enterable.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ extern "C" /** Generic function type declaration for entering an Environment. (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack) - + @param context @since UDK 3.2.7 */ @@ -49,7 +49,7 @@ typedef void uno_Enterable_enter (void * context); /** Generic function type declaration for levaing an Environment. (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack) - + @param context @since UDK 3.2.7 */ @@ -58,7 +58,7 @@ typedef void uno_Enterable_leave (void * context); /** Generic function type declaration for calling into an Environment. (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack) - + @param context @param pCallee the function to be called @param pParam the parameter pointer to be passed to the function @@ -69,7 +69,7 @@ typedef void uno_Enterable_callInto_v(void * context, uno_EnvCallee * pCallee, v /** Generic function type declaration for calling out of an Environment. (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack) - + @param context @param pCallee the function to be called @param pParam the parameter pointer to be passed to the function @@ -81,7 +81,7 @@ typedef void uno_Enterable_callOut_v (void * context, uno_EnvCallee * pCallee, v /** Generic function type declaration for checking if calling on managed object is valid. (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack) - + @param context @param ppReason the reason, in case calling is not valid @return 0 == calling is not valid, 1 == calling is valid @@ -95,14 +95,14 @@ typedef int uno_Enterable_isValid_v (void * context, rtl_uString ** ppReason); @since UDK 3.2.7 */ -typedef struct +typedef struct { uno_Enterable_enter * m_enter; uno_Enterable_leave * m_leave; uno_Enterable_callInto_v * m_callInto_v; uno_Enterable_callOut_v * m_callOut_v; uno_Enterable_isValid_v * m_isValid; -} +} uno_Enterable; diff --git a/cppu/inc/uno/EnvDcp.h b/cppu/inc/uno/EnvDcp.h index a2471815c179..8c4f21016535 100644 --- a/cppu/inc/uno/EnvDcp.h +++ b/cppu/inc/uno/EnvDcp.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ extern "C" /** Get the OBI type part of an environment descriptor. (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor) - + @param pEnvDcp the Environment Descriptor @param ppEnvTypeName the OBI type @since UDK 3.2.7 @@ -48,7 +48,7 @@ void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTyp /** Get the purpose part of an environment descriptor. (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor) - + @param pEnvDcp the Environment Descriptor @param ppEnvPurpose the purpose @since UDK 3.2.7 diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h index b359339b4686..a42121341053 100644 --- a/cppu/inc/uno/any2.h +++ b/cppu/inc/uno/any2.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,13 +69,13 @@ typedef struct _uno_Any /** Assign an any with a given value. Interfaces are acquired or released by the given callback functions. - - @param pDest pointer memory of destination any - @param pSource pointer to source value; defaults (0) to default constructed value - @param pTypeDescr type description of value; defaults (0) to void - @param acquire function called each time an interface needs to be acquired; + + @param pDest pointer memory of destination any + @param pSource pointer to source value; defaults (0) to default constructed value + @param pTypeDescr type description of value; defaults (0) to void + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno - @param release function called each time an interface needs to be released; + @param release function called each time an interface needs to be released; defaults (0) to uno */ void SAL_CALL uno_any_assign( @@ -85,13 +85,13 @@ void SAL_CALL uno_any_assign( SAL_THROW_EXTERN_C(); /** Assign an any with a given value. Interfaces are acquired or released by the given callback functions. - - @param pDest pointer memory of destination any - @param pSource pointer to source value; defaults (0) to default constructed value - @param pTypeDescr type description of value; defaults (0) to void - @param acquire function called each time an interface needs to be acquired; + + @param pDest pointer memory of destination any + @param pSource pointer to source value; defaults (0) to default constructed value + @param pTypeDescr type description of value; defaults (0) to void + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno - @param release function called each time an interface needs to be released; + @param release function called each time an interface needs to be released; defaults (0) to uno */ void SAL_CALL uno_type_any_assign( @@ -101,11 +101,11 @@ void SAL_CALL uno_type_any_assign( SAL_THROW_EXTERN_C(); /** Constructs an any with a given value. Interfaces are acquired by the given callback function. - - @param pDest pointer memory of destination any - @param pSource pointer to source value; defaults (0) to default constructed value - @param pTypeDescr type description of value; defaults (0) to void - @param acquire function called each time an interface needs to be acquired; + + @param pDest pointer memory of destination any + @param pSource pointer to source value; defaults (0) to default constructed value + @param pTypeDescr type description of value; defaults (0) to void + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno */ void SAL_CALL uno_any_construct( @@ -114,11 +114,11 @@ void SAL_CALL uno_any_construct( uno_AcquireFunc acquire ) SAL_THROW_EXTERN_C(); /** Constructs an any with a given value. Interfaces are acquired by the given callback function. - - @param pDest pointer memory of destination any - @param pSource pointer to source value; defaults (0) to default constructed value - @param pType type of value; defaults (0) to void - @param acquire function called each time an interface needs to be acquired; + + @param pDest pointer memory of destination any + @param pSource pointer to source value; defaults (0) to default constructed value + @param pType type of value; defaults (0) to void + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno */ void SAL_CALL uno_type_any_construct( @@ -128,11 +128,11 @@ void SAL_CALL uno_type_any_construct( SAL_THROW_EXTERN_C(); /** Constructs an any with a given value and converts/ maps interfaces. - - @param pDest pointer memory of destination any - @param pSource pointer to source value; defaults (0) to default constructed value - @param pTypeDescr type description of value; defaults (0) to void - @param mapping mapping to convert/ map interfaces + + @param pDest pointer memory of destination any + @param pSource pointer to source value; defaults (0) to default constructed value + @param pTypeDescr type description of value; defaults (0) to void + @param mapping mapping to convert/ map interfaces */ void SAL_CALL uno_any_constructAndConvert( uno_Any * pDest, void * pSource, @@ -140,11 +140,11 @@ void SAL_CALL uno_any_constructAndConvert( struct _uno_Mapping * mapping ) SAL_THROW_EXTERN_C(); /** Constructs an any with a given value and converts/ maps interfaces. - - @param pDest pointer memory of destination any - @param pSource pointer to source value; defaults (0) to default constructed value - @param pType type of value; defaults (0) to void - @param mapping mapping to convert/ map interfaces + + @param pDest pointer memory of destination any + @param pSource pointer to source value; defaults (0) to default constructed value + @param pType type of value; defaults (0) to void + @param mapping mapping to convert/ map interfaces */ void SAL_CALL uno_type_any_constructAndConvert( uno_Any * pDest, void * pSource, @@ -153,9 +153,9 @@ void SAL_CALL uno_type_any_constructAndConvert( SAL_THROW_EXTERN_C(); /** Destructs an any. - - @param pValue pointer to any - @param release function called each time an interface needs to be released; + + @param pValue pointer to any + @param release function called each time an interface needs to be released; defaults (0) to uno */ void SAL_CALL uno_any_destruct( @@ -163,9 +163,9 @@ void SAL_CALL uno_any_destruct( SAL_THROW_EXTERN_C(); /** Sets value to void. - - @param pValue pointer to any - @param release function called each time an interface needs to be released; + + @param pValue pointer to any + @param release function called each time an interface needs to be released; defaults (0) to uno */ void SAL_CALL uno_any_clear( diff --git a/cppu/inc/uno/cuno.h b/cppu/inc/uno/cuno.h index d5c5e7c82e80..fe4a96f36408 100644 --- a/cppu/inc/uno/cuno.h +++ b/cppu/inc/uno/cuno.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,9 +30,9 @@ #include <sal/types.h> -#define CUNO_ERROR_NONE 0 -#define CUNO_ERROR_CALL_FAILED (1 << 31) -#define CUNO_ERROR_EXCEPTION (1 | CUNO_ERROR_CALL_FAILED) +#define CUNO_ERROR_NONE 0 +#define CUNO_ERROR_CALL_FAILED (1 << 31) +#define CUNO_ERROR_EXCEPTION (1 | CUNO_ERROR_CALL_FAILED) /** macro to call on a C interface diff --git a/cppu/inc/uno/current_context.h b/cppu/inc/uno/current_context.h index 7abd2771df07..70d9ae2ddc03 100644 --- a/cppu/inc/uno/current_context.h +++ b/cppu/inc/uno/current_context.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ extern "C" @attention Don't spread the returned interface around to other threads. Every thread has its own current context. - + @param ppCurrentContext inout param current context of type com.sun.star.uno.XCurrentContext @param pEnvDcp descriptor of returned interface's environment @param pEnvContext context of returned interface's environment (commonly 0) @@ -51,7 +51,7 @@ sal_Bool SAL_CALL uno_getCurrentContext( SAL_THROW_EXTERN_C(); /** Sets the current task's context. - + @param pCurrentContext in param current context of type com.sun.star.uno.XCurrentContext @param pEnvDcp descriptor of interface's environment @param pEnvContext context of interface's environment (commonly 0) diff --git a/cppu/inc/uno/current_context.hxx b/cppu/inc/uno/current_context.hxx index 01d59a460eca..0fb001f7b91b 100644 --- a/cppu/inc/uno/current_context.hxx +++ b/cppu/inc/uno/current_context.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,11 +34,11 @@ namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno { @@ -46,7 +46,7 @@ namespace uno @attention Don't spread the returned interface around to other threads. Every thread has its own current context. - + @return current context or null ref, if none is set */ inline Reference< XCurrentContext > SAL_CALL getCurrentContext() @@ -84,10 +84,10 @@ class ContextLayer @internal */ Reference< XCurrentContext > m_xPreviousContext; - + public: /** Constructor: Saves the previous context and sets the new (given) one. - + @param xNewContext new context to be set */ inline ContextLayer( @@ -96,9 +96,9 @@ public: /** Destructor: restores the previous context. */ inline ~ContextLayer() SAL_THROW( () ); - + /** Gets the previously set context. - + @return the previously set context */ inline Reference< XCurrentContext > SAL_CALL getPreviousContext() const diff --git a/cppu/inc/uno/data.h b/cppu/inc/uno/data.h index 8a86b89841d7..545affe2d4b3 100644 --- a/cppu/inc/uno/data.h +++ b/cppu/inc/uno/data.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ struct _typelib_InterfaceTypeDescription; struct _uno_Mapping; /** Generic function pointer declaration to query for an interface. - + @param pInterface interface @param pTypedemanded interface type @return interface pointer @@ -49,27 +49,27 @@ struct _uno_Mapping; typedef void * (SAL_CALL * uno_QueryInterfaceFunc)( void * pInterface, struct _typelib_TypeDescriptionReference * pType ); /** Generic function pointer declaration to acquire an interface. - + @param pInterface interface to be acquired */ typedef void (SAL_CALL * uno_AcquireFunc)( void * pInterface ); /** Generic function pointer declaration to release an interface. - + @param pInterface interface to be release */ typedef void (SAL_CALL * uno_ReleaseFunc)( void * pInterface ); /** Tests if two values are equal. May compare different types (e.g., short to long). - - @param pVal1 pointer to a value - @param pVal1TypeDescr type description of pVal1 - @param pVal2 pointer to another value - @param pVal2TypeDescr type description of pVal2 - @param queryInterface function called each time two interfaces are tested whether they belong + + @param pVal1 pointer to a value + @param pVal1TypeDescr type description of pVal1 + @param pVal2 pointer to another value + @param pVal2TypeDescr type description of pVal2 + @param queryInterface function called each time two interfaces are tested whether they belong to the same object; defaults (0) to uno - @param release function to release queried interfaces; defaults (0) to uno + @param release function to release queried interfaces; defaults (0) to uno @return true if values are equal */ sal_Bool SAL_CALL uno_equalData( @@ -78,14 +78,14 @@ sal_Bool SAL_CALL uno_equalData( uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C(); /** Tests if two values are equal. May compare different types (e.g., short to long). - - @param pVal1 pointer to a value - @param pVal1Type type of pVal1 - @param pVal2 pointer to another value - @param pVal2Type type of pVal2 - @param queryInterface function called each time two interfaces are tested whether they belong + + @param pVal1 pointer to a value + @param pVal1Type type of pVal1 + @param pVal2 pointer to another value + @param pVal2Type type of pVal2 + @param queryInterface function called each time two interfaces are tested whether they belong to the same object; defaults (0) to uno - @param release function to release queried interfaces; defaults (0) to uno + @param release function to release queried interfaces; defaults (0) to uno @return true if values are equal */ sal_Bool SAL_CALL uno_type_equalData( @@ -96,11 +96,11 @@ sal_Bool SAL_CALL uno_type_equalData( /** Copy construct memory with given value. The size of the destination value must be larger or equal to the size of the source value. - - @param pDest pointer to destination value memory - @param pSource pointer to source value - @param pTypeDescr type description of source - @param acquire function called each time an interface needs to be acquired; + + @param pDest pointer to destination value memory + @param pSource pointer to source value + @param pTypeDescr type description of source + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno */ void SAL_CALL uno_copyData( @@ -109,11 +109,11 @@ void SAL_CALL uno_copyData( SAL_THROW_EXTERN_C(); /** Copy construct memory with given value. The size of the destination value must be larger or equal to the size of the source value. - - @param pDest pointer to destination value memory - @param pSource pointer to source value - @param pType type of source - @param acquire function called each time an interface needs to be acquired; + + @param pDest pointer to destination value memory + @param pSource pointer to source value + @param pType type of source + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno */ void SAL_CALL uno_type_copyData( @@ -123,11 +123,11 @@ void SAL_CALL uno_type_copyData( /** Copy construct memory with given value. The size of the destination value must be larger or equal to the size of the source value. Interfaces are converted/ mapped by mapping parameter. - - @param pDest pointer to destination value memory - @param pSource pointer to source value - @param pTypeDescr type description of source - @param mapping mapping to convert/ map interfaces + + @param pDest pointer to destination value memory + @param pSource pointer to source value + @param pTypeDescr type description of source + @param mapping mapping to convert/ map interfaces */ void SAL_CALL uno_copyAndConvertData( void * pDest, void * pSource, @@ -135,11 +135,11 @@ void SAL_CALL uno_copyAndConvertData( SAL_THROW_EXTERN_C(); /** Copy construct memory with given value. The size of the destination value must be larger or equal to the size of the source value. Interfaces are converted/ mapped by mapping parameter. - - @param pDest pointer to destination value memory - @param pSource pointer to source value - @param pType type of source - @param mapping mapping to convert/ map interfaces + + @param pDest pointer to destination value memory + @param pSource pointer to source value + @param pType type of source + @param mapping mapping to convert/ map interfaces */ void SAL_CALL uno_type_copyAndConvertData( void * pDest, void * pSource, @@ -147,20 +147,20 @@ void SAL_CALL uno_type_copyAndConvertData( SAL_THROW_EXTERN_C(); /** Destructs a given value; does NOT free its memory! - - @param pValue value to be destructed - @param pTypeDescr type description of value - @param release function called each time an interface pointer needs to be released; + + @param pValue value to be destructed + @param pTypeDescr type description of value + @param release function called each time an interface pointer needs to be released; defaults (0) to uno */ void SAL_CALL uno_destructData( void * pValue, struct _typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C(); /** Destructs a given value; does NOT free its memory! - - @param pValue value to be destructed - @param pType type of value - @param release function called each time an interface pointer needs to be released; + + @param pValue value to be destructed + @param pType type of value + @param release function called each time an interface pointer needs to be released; defaults (0) to uno */ void SAL_CALL uno_type_destructData( @@ -168,17 +168,17 @@ void SAL_CALL uno_type_destructData( SAL_THROW_EXTERN_C(); /** Default constructs a value. All simple types are set to 0, enums are set to their default value. - - @param pMem pointer to memory of value to be constructed - @param pTypeDescr type description of value to be constructed + + @param pMem pointer to memory of value to be constructed + @param pTypeDescr type description of value to be constructed */ void SAL_CALL uno_constructData( void * pMem, struct _typelib_TypeDescription * pTypeDescr ) SAL_THROW_EXTERN_C(); /** Default constructs a value. All simple types are set to 0, enums are set to their default value. - - @param pMem pointer to memory of value to be constructed - @param pType type of value to be constructed + + @param pMem pointer to memory of value to be constructed + @param pType type of value to be constructed */ void SAL_CALL uno_type_constructData( void * pMem, struct _typelib_TypeDescriptionReference * pType ) @@ -188,17 +188,17 @@ void SAL_CALL uno_type_constructData( Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short). Querying for demanded interface type is allowed. Assignment from any value to a value of type Any and vice versa is allowed. - - @param pDest pointer to destination value - @param pDestTypeDescr type description of destination value - @param pSource pointer to source value; if 0, then destination value will be assigned + + @param pDest pointer to destination value + @param pDestTypeDescr type description of destination value + @param pSource pointer to source value; if 0, then destination value will be assigned to default value - @param pSourceTypeDescr type destination of source value - @param queryInterface function called each time an interface needs to be queried; + @param pSourceTypeDescr type destination of source value + @param queryInterface function called each time an interface needs to be queried; defaults (0) to uno - @param acquire function called each time an interface needs to be acquired; + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno - @param release function called each time an interface needs to be released; + @param release function called each time an interface needs to be released; defaults (0) to uno @return true if destination has been successfully assigned */ @@ -211,17 +211,17 @@ sal_Bool SAL_CALL uno_assignData( Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short). Querying for demanded interface type is allowed. Assignment from any value to a value of type Any and vice versa is allowed. - - @param pDest pointer to destination value - @param pDestType type of destination value - @param pSource pointer to source value; if 0, then destination value will be assigned + + @param pDest pointer to destination value + @param pDestType type of destination value + @param pSource pointer to source value; if 0, then destination value will be assigned to default value - @param pSourceType type of source value - @param queryInterface function called each time an interface needs to be queried; + @param pSourceType type of source value + @param queryInterface function called each time an interface needs to be queried; defaults (0) to uno - @param acquire function called each time an interface needs to be acquired; + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno - @param release function called each time an interface needs to be released; + @param release function called each time an interface needs to be released; defaults (0) to uno @return true if destination has been successfully assigned */ @@ -235,13 +235,13 @@ sal_Bool SAL_CALL uno_type_assignData( Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short). Querying for demanded interface type is allowed. Assignment from any value to a value of type Any and vice versa is allowed. - + @param pAssignable type - @param pFrom pointer to value - @param pFromType type of value - @param queryInterface function called each time an interface needs to be queried; + @param pFrom pointer to value + @param pFromType type of value + @param queryInterface function called each time an interface needs to be queried; defaults (0) to uno - @param release function called each time an interface needs to be released; + @param release function called each time an interface needs to be released; defaults (0) to uno @return true if value is destination has been successfully assigned */ diff --git a/cppu/inc/uno/dispatcher.h b/cppu/inc/uno/dispatcher.h index 74b73d3f2127..42bde5e8c8bb 100644 --- a/cppu/inc/uno/dispatcher.h +++ b/cppu/inc/uno/dispatcher.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,18 +45,18 @@ struct _uno_Interface; If an exception is signalled, the any *ppException is properly constructed by the callee, otherwise the pointer *ppException is set to 0. An attribute get call is indicated by a non-null return pointer. - - @param pUnoI uno interface the call is performed on - @param pMemberType member type description of a method or attribute - @param pReturn pointer to return value memory; + + @param pUnoI uno interface the call is performed on + @param pMemberType member type description of a method or attribute + @param pReturn pointer to return value memory; pointer may be undefined if void method, null if attribute set call. - @param pArgs an array of pointers to arguments values. + @param pArgs an array of pointers to arguments values. (remark: the value of an interface reference stores a uno_interface *, so you get it by *(uno_Interface **)pArgs[n]) - @param ppException pointer to pointer to unconstructed any to signal an exception. + @param ppException pointer to pointer to unconstructed any to signal an exception. */ typedef void (SAL_CALL * uno_DispatchMethod)( - struct _uno_Interface * pUnoI, + struct _uno_Interface * pUnoI, const struct _typelib_TypeDescription * pMemberType, void * pReturn, void * pArgs[], @@ -73,12 +73,12 @@ typedef void (SAL_CALL * uno_DispatchMethod)( typedef struct _uno_Interface { /** Acquires uno interface. - + @param pInterface uno interface */ void (SAL_CALL * acquire)( struct _uno_Interface * pInterface ); /** Releases uno interface. - + @param pInterface uno interface */ void (SAL_CALL * release)( struct _uno_Interface * pInterface ); diff --git a/cppu/inc/uno/dispatcher.hxx b/cppu/inc/uno/dispatcher.hxx index 90fdb3db6df7..309c9e846d02 100644 --- a/cppu/inc/uno/dispatcher.hxx +++ b/cppu/inc/uno/dispatcher.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,17 +33,17 @@ namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno { /** C++ holder reference for binary C uno_Interface. Not for public use, may be subject to changes. - + @see uno_Interface @internal not for public use! @@ -52,10 +52,10 @@ class UnoInterfaceReference { public: uno_Interface * m_pUnoI; - + inline bool is() const { return m_pUnoI != 0; } - + inline ~UnoInterfaceReference(); inline UnoInterfaceReference(); inline UnoInterfaceReference( uno_Interface * pUnoI, __sal_NoAcquire ); @@ -64,24 +64,24 @@ public: inline uno_Interface * get() const { return m_pUnoI; } - + inline UnoInterfaceReference & set( uno_Interface * pUnoI ); inline UnoInterfaceReference & set( uno_Interface * pUnoI, __sal_NoAcquire ); inline void clear(); - + inline UnoInterfaceReference & operator = ( UnoInterfaceReference const & ref ) { return set( ref.m_pUnoI ); } inline UnoInterfaceReference & operator = ( uno_Interface * pUnoI ) { return set( pUnoI ); } - + inline void dispatch( struct _typelib_TypeDescription const * pMemberType, void * pReturn, void * pArgs [], uno_Any ** ppException ) const; - + private: inline bool operator == ( UnoInterfaceReference const & ); // not impl inline bool operator != ( UnoInterfaceReference const & ); // not impl @@ -125,7 +125,7 @@ inline UnoInterfaceReference::UnoInterfaceReference( if (m_pUnoI != 0) (*m_pUnoI->acquire)( m_pUnoI ); } - + //______________________________________________________________________________ inline UnoInterfaceReference & UnoInterfaceReference::set( uno_Interface * pUnoI ) diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h index 4a02c46abc28..e362ce7a6e88 100644 --- a/cppu/inc/uno/environment.h +++ b/cppu/inc/uno/environment.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,69 +53,69 @@ typedef struct _uno_Environment { /** reserved for future use (0 if not used) */ - void * pReserved; - + void * pReserved; + /** type name of environment */ - rtl_uString * pTypeName; - + rtl_uString * pTypeName; + /** free context pointer to be used for specific classes of environments (e.g., a jvm pointer) */ - void * pContext; - + void * pContext; + /** pointer to extended environment (interface registration functionality), if supported */ struct _uno_ExtEnvironment * pExtEnv; - + /** Acquires this environment. - + @param pEnv this environment */ void (SAL_CALL * acquire)( struct _uno_Environment * pEnv ); - + /** Releases this environment; last release of environment will revoke the environment from runtime. - + @param pEnv this environment */ void (SAL_CALL * release)( struct _uno_Environment * pEnv ); - + /** Acquires this environment weakly. You can only harden a weakly held environment if it is still acquired hard (acquire()). - + @param pEnv this environment */ void (SAL_CALL * acquireWeak)( struct _uno_Environment * pEnv ); - + /** Releases this environment weakly in correspondence to acquireWeak(). - + @param pEnv this environment */ void (SAL_CALL * releaseWeak)( struct _uno_Environment * pEnv ); - + /** Makes hard reference out of weak referenced environment. You can only harden a weakly held environment if it is still acquired hard (acquire()). - + @param ppHardEnv inout hard referenced environment (has to be released via release()) @param pEnv environment (may be weak referenced) */ void (SAL_CALL * harden)( struct _uno_Environment ** ppHardEnv, struct _uno_Environment * pEnv ); - + /** Call this function to EXPLICITLY dispose this environment (e.g., release all interfaces). You may want to call this function before shutting down due to a runtime error. - + @param pEnv this environment */ void (SAL_CALL * dispose)( struct _uno_Environment * pEnv ); - + /* ===== the following part will be late initialized by a matching bridge ===== * - * ===== and is NOT for public use. ===== */ - + * ===== and is NOT for public use. ===== */ + /** CALLBACK function pointer: Disposing callback function pointer that can be set to get signalled before the environment is destroyed. - + @param pEnv environment that is being disposed */ void (SAL_CALL * environmentDisposing)( struct _uno_Environment * pEnv ); @@ -126,14 +126,14 @@ typedef struct _uno_Environment Any proxy object must register itself on first acquire() call and revoke itself on last release() call. This can happen several times because the environment caches proxy objects until the environment explicitly frees the proxy object calling this function. - + @param pEnv environment @param pProxy proxy pointer */ typedef void (SAL_CALL * uno_freeProxyFunc)( struct _uno_ExtEnvironment * pEnv, void * pProxy ); /** Generic function pointer declaration to allocate memory. Used with getRegisteredInterfaces(). - + @param nBytes amount of memory in bytes @return pointer to allocated memory */ @@ -146,28 +146,28 @@ typedef struct _uno_ExtEnvironment /** inherits all members of an uno_Environment */ uno_Environment aBase; - + /** Registers an interface of this environment. - - @param pEnv this environment - @param ppInterface inout parameter of interface to be registered - @param pOId object id of interface - @param pTypeDescr type description of interface + + @param pEnv this environment + @param ppInterface inout parameter of interface to be registered + @param pOId object id of interface + @param pTypeDescr type description of interface */ void (SAL_CALL * registerInterface)( struct _uno_ExtEnvironment * pEnv, void ** ppInterface, rtl_uString * pOId, struct _typelib_InterfaceTypeDescription * pTypeDescr ); - + /** Registers a proxy interface of this environment that can be reanimated and is freed explicitly by this environment. - - @param pEnv this environment - @param ppInterface inout parameter of interface to be registered - @param freeProxy function to free proxy object - @param pOId object id of interface - @param pTypeDescr type description of interface + + @param pEnv this environment + @param ppInterface inout parameter of interface to be registered + @param freeProxy function to free proxy object + @param pOId object id of interface + @param pTypeDescr type description of interface */ void (SAL_CALL * registerProxyInterface)( struct _uno_ExtEnvironment * pEnv, @@ -175,48 +175,48 @@ typedef struct _uno_ExtEnvironment uno_freeProxyFunc freeProxy, rtl_uString * pOId, struct _typelib_InterfaceTypeDescription * pTypeDescr ); - + /** Revokes an interface from this environment. You have to revoke any interface that has been registered via this method. - - @param pEnv this environment - @param pInterface interface to be revoked + + @param pEnv this environment + @param pInterface interface to be revoked */ void (SAL_CALL * revokeInterface)( struct _uno_ExtEnvironment * pEnv, void * pInterface ); - + /** Provides the object id of a given interface. - - @param ppOut inout oid - @param pInterface interface of object + + @param ppOut inout oid + @param pInterface interface of object */ void (SAL_CALL * getObjectIdentifier)( struct _uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ); - + /** Retrieves an interface identified by its object id and type from this environment. Interfaces are retrieved in the same order as they are registered. - - @param pEnv this environment - @param ppInterface inout parameter for the registered interface; (0) if none was found - @param pOId object id of interface to be retrieved - @param pTypeDescr type description of interface to be retrieved + + @param pEnv this environment + @param ppInterface inout parameter for the registered interface; (0) if none was found + @param pOId object id of interface to be retrieved + @param pTypeDescr type description of interface to be retrieved */ void (SAL_CALL * getRegisteredInterface)( struct _uno_ExtEnvironment * pEnv, void ** ppInterface, rtl_uString * pOId, struct _typelib_InterfaceTypeDescription * pTypeDescr ); - + /** Returns all currently registered interfaces of this environment. The memory block allocated might be slightly larger than (*pnLen * sizeof(void *)). - - @param pEnv this environment + + @param pEnv this environment @param pppInterfaces out param; pointer to array of interface pointers - @param pnLen out param; length of array - @param memAlloc function for allocating memory that is passed back + @param pnLen out param; length of array + @param memAlloc function for allocating memory that is passed back */ void (SAL_CALL * getRegisteredInterfaces)( struct _uno_ExtEnvironment * pEnv, @@ -227,33 +227,33 @@ typedef struct _uno_ExtEnvironment /* ===== the following part will be late initialized by a matching bridge ===== */ /** Computes an object id of the given interface; is called by the environment implementation. - - @param pEnv corresponding environment - @param ppOId out param: computed id - @param pInterface an interface + + @param pEnv corresponding environment + @param ppOId out param: computed id + @param pInterface an interface */ void (SAL_CALL * computeObjectIdentifier)( struct _uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ); - + /** Function to acquire an interface. - - @param pEnv corresponding environment - @param pInterface an interface + + @param pEnv corresponding environment + @param pInterface an interface */ void (SAL_CALL * acquireInterface)( struct _uno_ExtEnvironment * pEnv, void * pInterface ); - + /** Function to release an interface. - - @param pEnv corresponding environment - @param pInterface an interface + + @param pEnv corresponding environment + @param pInterface an interface */ void (SAL_CALL * releaseInterface)( struct _uno_ExtEnvironment * pEnv, void * pInterface ); - + } uno_ExtEnvironment; #if defined( SAL_W32) || defined(SAL_OS2) @@ -262,7 +262,7 @@ typedef struct _uno_ExtEnvironment /** Function exported by some bridge library providing acquireInterface(), releaseInterface(); may set a disposing callback. - + @param pEnv environment to be initialized */ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv ); @@ -270,10 +270,10 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv ); /** Gets a specific environment. If the specified environment does not exist, then a default one is created and registered. The environment revokes itself on last release() call. - - @param ppEnv inout parameter of environment; given environment will be released - @param pEnvDcp descriptor of environment - @param pContext some context pointer (e.g., to distinguish java vm; set 0 if not needed) + + @param ppEnv inout parameter of environment; given environment will be released + @param pEnvDcp descriptor of environment + @param pContext some context pointer (e.g., to distinguish java vm; set 0 if not needed) */ void SAL_CALL uno_getEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) @@ -281,10 +281,10 @@ void SAL_CALL uno_getEnvironment( /** Gets all specified environments. Caller has to release returned environments and free allocated memory. - - @param pppEnvs out param; pointer to array of environments - @param pnLen out param; length of array - @param memAlloc function for allocating memory that is passed back + + @param pppEnvs out param; pointer to array of environments + @param pnLen out param; length of array + @param memAlloc function for allocating memory that is passed back @param pEnvDcp descriptor of environments; 0 defaults to all */ void SAL_CALL uno_getRegisteredEnvironments( @@ -293,29 +293,29 @@ void SAL_CALL uno_getRegisteredEnvironments( SAL_THROW_EXTERN_C(); /** Creates an environment. The new environment is anonymous (NOT publicly registered/ accessible). - - @param ppEnv out parameter of environment; given environment will be released + + @param ppEnv out parameter of environment; given environment will be released @param pEnvDcp descriptor of environment - @param pContext context pointer (e.g., to distinguish java vm); set 0 if not needed + @param pContext context pointer (e.g., to distinguish java vm); set 0 if not needed */ void SAL_CALL uno_createEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) SAL_THROW_EXTERN_C(); /** Dumps out environment information, i.e. registered interfaces. - - @param stream output stream (FILE *) - @param pEnv environment to be dumped - @param pFilter if not null, filters output + + @param stream output stream (FILE *) + @param pEnv environment to be dumped + @param pFilter if not null, filters output */ void SAL_CALL uno_dumpEnvironment( void * stream, uno_Environment * pEnv, const sal_Char * pFilter ) SAL_THROW_EXTERN_C(); /** Dumps out environment information, i.e. registered interfaces. - - @param stream output stream (FILE *) + + @param stream output stream (FILE *) @param pEnvDcp descritpro of environment to be dumped - @param pFilter if not null, filters output + @param pFilter if not null, filters output */ void SAL_CALL uno_dumpEnvironmentByName( void * stream, rtl_uString * pEnvDcp, const sal_Char * pFilter ) @@ -327,7 +327,7 @@ void SAL_CALL uno_dumpEnvironmentByName( In case no Environment has explicitly been entered, a purpose free default environment gets returned (e.g. the "uno" or "gcc3" Environment). - @param ppEnv inout parameter; a given environment will be released + @param ppEnv inout parameter; a given environment will be released @param pTypeName the optional type of the environment, falls back to "uno" @since UDK 3.2.7 */ @@ -348,7 +348,7 @@ typedef void SAL_CALL uno_EnvCallee(va_list * pParam); void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_list * pParam) SAL_THROW_EXTERN_C(); -/** Invoke the passed function in the given environment. +/** Invoke the passed function in the given environment. @param pEnv the target environment @param pCallee the function to call @@ -358,7 +358,7 @@ void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * p void SAL_CALL uno_Environment_invoke (uno_Environment * pEnv, uno_EnvCallee * pCallee, ...) SAL_THROW_EXTERN_C(); -/** Enter an environment explicitly. +/** Enter an environment explicitly. @param pEnv the environment to enter; NULL leaves all environments @since UDK 3.2.7 diff --git a/cppu/inc/uno/environment.hxx b/cppu/inc/uno/environment.hxx index 8fa4f3ea5063..41c8435421d5 100644 --- a/cppu/inc/uno/environment.hxx +++ b/cppu/inc/uno/environment.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,13 +36,13 @@ /** */ //for docpp namespace com -{ +{ /** */ //for docpp namespace sun -{ +{ /** */ //for docpp namespace star -{ +{ /** */ //for docpp namespace uno { @@ -56,7 +56,7 @@ class Environment /** binary C uno_Environment */ uno_Environment * _pEnv; - + public: /** Returns the current Environment. @@ -79,13 +79,13 @@ public: /** @internal */ inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) {} - + /** Constructor: acquires given environment - + @param pEnv environment */ inline Environment( uno_Environment * pEnv = 0 ) SAL_THROW( () ); - + /** Gets a specific environment. If the specified environment does not exist, then a default one is created and registered. @@ -96,7 +96,7 @@ public: /** Copy constructor: acquires given environment - + @param rEnv another environment */ inline Environment( const Environment & rEnv ) SAL_THROW( () ); @@ -104,49 +104,49 @@ public: /** Destructor: releases a set environment. */ inline ~Environment() SAL_THROW( () ); - + /** Sets a given environment, i.e. acquires given one and releases a set one. - + @param pEnv another environment @return this environment */ inline Environment & SAL_CALL operator = ( uno_Environment * pEnv ) SAL_THROW( () ); /** Sets a given environment, i.e. acquires given one and releases a set one. - + @param rEnv another environment @return this environment */ inline Environment & SAL_CALL operator = ( const Environment & rEnv ) SAL_THROW( () ) { return operator = ( rEnv._pEnv ); } - + /** Provides UNacquired pointer to the set C environment. - + @return UNacquired pointer to the C environment struct */ inline uno_Environment * SAL_CALL get() const SAL_THROW( () ) { return _pEnv; } - + /** Gets type name of set environment. - + @return type name of set environment */ inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW( () ) { return _pEnv->pTypeName; } - + /** Gets free context pointer of set environment. - + @return free context pointer of set environment */ inline void * SAL_CALL getContext() const SAL_THROW( () ) { return _pEnv->pContext; } - + /** Tests if a environment is set. - + @return true, if a environment is set, false otherwise */ inline sal_Bool SAL_CALL is() const SAL_THROW( () ) { return (_pEnv != 0); } - + /** Releases a set environment. */ inline void SAL_CALL clear() SAL_THROW( () ); @@ -159,7 +159,7 @@ public: */ inline void SAL_CALL invoke_v(uno_EnvCallee * pCallee, va_list * pParam) const SAL_THROW( () ); - /** Invoke the passed function in this environment. + /** Invoke the passed function in this environment. @param pCallee the function to call @param ... the parameters to be passed to the function @@ -167,13 +167,13 @@ public: */ inline void SAL_CALL invoke(uno_EnvCallee * pCallee, ...) const SAL_THROW( () ); - /** Enter this environment explicitly. + /** Enter this environment explicitly. @since UDK 3.2.7 */ inline void SAL_CALL enter() const SAL_THROW( () ); - /** Checks, if it is valid to currently call objects + /** Checks, if it is valid to currently call objects belonging to this environment. @since UDK 3.2.7 @@ -237,15 +237,15 @@ inline void SAL_CALL Environment::invoke_v(uno_EnvCallee * pCallee, va_list * pP //__________________________________________________________________________________________________ inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const SAL_THROW( () ) { - if (_pEnv) + if (_pEnv) { va_list param; - + va_start(param, pCallee); uno_Environment_invoke_v(_pEnv, pCallee, ¶m); va_end(param); } - + } //__________________________________________________________________________________________________ inline void SAL_CALL Environment::enter() const SAL_THROW( () ) diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h index f9e32a957312..34943dc9d93f 100644 --- a/cppu/inc/uno/lbnames.h +++ b/cppu/inc/uno/lbnames.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #define CPPU_STRINGIFY( x ) CPPU_STRINGIFY_EX( x ) /** Name for C++ compiler/ platform, e.g. "gcc3", "msci" */ -#define CPPU_CURRENT_LANGUAGE_BINDING_NAME CPPU_STRINGIFY( CPPU_ENV ) +#define CPPU_CURRENT_LANGUAGE_BINDING_NAME CPPU_STRINGIFY( CPPU_ENV ) #else diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h index 082b59907ad4..99f8598d9df1 100644 --- a/cppu/inc/uno/mapping.h +++ b/cppu/inc/uno/mapping.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,10 +52,10 @@ typedef void (SAL_CALL * uno_AcquireMappingFunc)(struct _uno_Mapping *); typedef void (SAL_CALL * uno_ReleaseMappingFunc)(struct _uno_Mapping *); /** Function pointer declaration to map an interface from one environment to another. - - @param pMapping mapping - @param ppOut [inout] destination interface; existing interfaces are released - @param pInterface source interface + + @param pMapping mapping + @param ppOut [inout] destination interface; existing interfaces are released + @param pInterface source interface @param pInterfaceTypeDescr type description of the interface */ typedef void (SAL_CALL * uno_MapInterfaceFunc)( @@ -92,13 +92,13 @@ typedef struct _uno_Mapping #endif /** Gets an interface mapping from one environment to another. - - @param ppMapping [inout] mapping; existing mapping will be released - @param pFrom source environment - @param pTo destination environment + + @param ppMapping [inout] mapping; existing mapping will be released + @param pFrom source environment + @param pTo destination environment (interfaces resulting in mapInterface() call can be used in this language environment) - @param pAddPurpose additional purpose of mapping (e.g., protocolling); defaults to 0 (none) + @param pAddPurpose additional purpose of mapping (e.g., protocolling); defaults to 0 (none) */ void SAL_CALL uno_getMapping( struct _uno_Mapping ** ppMapping, @@ -108,11 +108,11 @@ void SAL_CALL uno_getMapping( SAL_THROW_EXTERN_C(); /** Callback function pointer declaration to get a mapping. - - @param ppMapping inout mapping - @param pFrom source environment - @param pTo destination environment - @param pAddPurpose additional purpose + + @param ppMapping inout mapping + @param pFrom source environment + @param pTo destination environment + @param pAddPurpose additional purpose */ typedef void (SAL_CALL * uno_getMappingFunc)( struct _uno_Mapping ** ppMapping, @@ -121,35 +121,35 @@ typedef void (SAL_CALL * uno_getMappingFunc)( rtl_uString * pAddPurpose ); /** Registers a callback being called each time a mapping is demanded. - - @param pCallback callback function + + @param pCallback callback function */ void SAL_CALL uno_registerMappingCallback( uno_getMappingFunc pCallback ) SAL_THROW_EXTERN_C(); /** Revokes a mapping callback registration. - - @param pCallback callback function + + @param pCallback callback function */ void SAL_CALL uno_revokeMappingCallback( uno_getMappingFunc pCallback ) SAL_THROW_EXTERN_C(); /** Function pointer declaration to free a mapping. - - @param pMapping mapping to be freed + + @param pMapping mapping to be freed */ typedef void (SAL_CALL * uno_freeMappingFunc)( struct _uno_Mapping * pMapping ); /** Registers a mapping. A mapping registers itself on first acquire and revokes itself on last release. The given freeMapping function is called by the runtime to cleanup any resources. - - @param ppMapping inout mapping to be registered - @param freeMapping called by runtime to delete mapping - @param pFrom source environment - @param pTo destination environment - @param pAddPurpose additional purpose string; defaults to 0 + + @param ppMapping inout mapping to be registered + @param freeMapping called by runtime to delete mapping + @param pFrom source environment + @param pTo destination environment + @param pAddPurpose additional purpose string; defaults to 0 */ void SAL_CALL uno_registerMapping( struct _uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping, @@ -158,8 +158,8 @@ void SAL_CALL uno_registerMapping( /** Revokes a mapping. A mapping registers itself on first acquire and revokes itself on last release. - - @param pMapping mapping to be revoked + + @param pMapping mapping to be revoked */ void SAL_CALL uno_revokeMapping( struct _uno_Mapping * pMapping ) @@ -167,13 +167,13 @@ void SAL_CALL uno_revokeMapping( /** Gets an interface mapping from one language environment to another by corresponding environment type names. - - @param ppMapping [inout] mapping; existing mapping will be released - @param pFrom source environment type name - @param pTo destination environment type name + + @param ppMapping [inout] mapping; existing mapping will be released + @param pFrom source environment type name + @param pTo destination environment type name (interfaces resulting in mapInterface() call can be used in this language environment) - @param pAddPurpose additional purpose of mapping (e.g., protocolling); defaults to 0 (none) + @param pAddPurpose additional purpose of mapping (e.g., protocolling); defaults to 0 (none) */ void SAL_CALL uno_getMappingByName( struct _uno_Mapping ** ppMapping, @@ -187,10 +187,10 @@ void SAL_CALL uno_getMappingByName( /** Function pointer declaration to get a mapping from a loaded bridge. Bridges export a function called uno_ext_getMapping() of this signature. - - @param ppMapping [inout] mapping; existing mapping will be released - @pFrom source environment - @pTo destination environment + + @param ppMapping [inout] mapping; existing mapping will be released + @pFrom source environment + @pTo destination environment */ typedef void (SAL_CALL * uno_ext_getMappingFunc)( struct _uno_Mapping ** ppMapping, diff --git a/cppu/inc/uno/mapping.hxx b/cppu/inc/uno/mapping.hxx index a183cf089de3..73223fe87ef1 100644 --- a/cppu/inc/uno/mapping.hxx +++ b/cppu/inc/uno/mapping.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,11 +42,11 @@ typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescriptio typedef struct _uno_Interface uno_Interface; namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno { @@ -57,7 +57,7 @@ namespace uno class Mapping { uno_Mapping * _pMapping; - + public: // these are here to force memory de/allocation to sal lib. /** @internal */ @@ -72,30 +72,30 @@ public: /** @internal */ inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) {} - + /** Holds a mapping from the specified source to the specified destination by environment type names. - - @param rFrom type name of source environment - @param rTo type name of destination environment - @param rAddPurpose additional purpose + + @param rFrom type name of source environment + @param rTo type name of destination environment + @param rAddPurpose additional purpose */ inline Mapping( const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo, const ::rtl::OUString & rAddPurpose = ::rtl::OUString() ) SAL_THROW( () ); - + /** Holds a mapping from the specified source to the specified destination. - - @param pFrom source environment - @param pTo destination environment - @param rAddPurpose additional purpose + + @param pFrom source environment + @param pTo destination environment + @param rAddPurpose additional purpose */ inline Mapping( uno_Environment * pFrom, uno_Environment * pTo, const ::rtl::OUString & rAddPurpose = ::rtl::OUString() ) SAL_THROW( () ); - + /** Holds a mapping from the specified source to the specified destination environment. @@ -108,100 +108,100 @@ public: SAL_THROW( () ); /** Constructor. - + @param pMapping another mapping */ inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () ); - + /** Copy constructor. - + @param rMapping another mapping */ inline Mapping( const Mapping & rMapping ) SAL_THROW( () ); - + /** Destructor. */ inline ~Mapping() SAL_THROW( () ); - + /** Sets a given mapping. - + @param pMapping another mapping @return this mapping */ inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW( () ); /** Sets a given mapping. - + @param rMapping another mapping @return this mapping */ inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) SAL_THROW( () ) { return operator = ( rMapping._pMapping ); } - + /** Provides a pointer to the C mapping. The returned mapping is NOT acquired! - + @return UNacquired C mapping */ inline uno_Mapping * SAL_CALL get() const SAL_THROW( () ) { return _pMapping; } - + /** Tests if a mapping is set. - + @return true if a mapping is set */ inline sal_Bool SAL_CALL is() const SAL_THROW( () ) { return (_pMapping != 0); } - + /** Releases a set mapping. */ inline void SAL_CALL clear() SAL_THROW( () ); - + /** Maps an interface from one environment to another. - - @param pInterface source interface - @param pTypeDescr type description of interface - @return mapped interface + + @param pInterface source interface + @param pTypeDescr type description of interface + @return mapped interface */ inline void * SAL_CALL mapInterface( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW( () ); /** Maps an interface from one environment to another. - - @param pInterface source interface - @param pTypeDescr type description of interface - @return mapped interface + + @param pInterface source interface + @param pTypeDescr type description of interface + @return mapped interface */ inline void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ) { return mapInterface( pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); } - + /** Maps an interface from one environment to another. - - @param pInterface source interface - @param rType type of interface - @return mapped interface + + @param pInterface source interface + @param rType type of interface + @return mapped interface */ inline void * SAL_CALL mapInterface( void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW( () ); - + /** Maps an interface from one environment to another. - - @param ppOut inout mapped interface - @param pInterface source interface - @param pTypeDescr type description of interface + + @param ppOut inout mapped interface + @param pInterface source interface + @param pTypeDescr type description of interface */ inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW( () ) { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, pTypeDescr ); } /** Maps an interface from one environment to another. - - @param ppOut inout mapped interface - @param pInterface source interface - @param pTypeDescr type description of interface + + @param ppOut inout mapped interface + @param pInterface source interface + @param pTypeDescr type description of interface */ inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ) { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); } - + /** Maps an interface from one environment to another. - - @param ppOut inout mapped interface - @param pInterface source interface - @param rType type of interface to be mapped + + @param ppOut inout mapped interface + @param pInterface source interface + @param rType type of interface to be mapped */ inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW( () ); }; @@ -304,7 +304,7 @@ inline void * Mapping::mapInterface( (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Purpose Environments) Maps an binary C UNO interface to be used in the currently used compiler environment. - + @tplparam C interface type @param ppRet inout returned interface pointer @param pUnoI binary C UNO interface @@ -327,7 +327,7 @@ inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_TH (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Purpose Environments) Maps an UNO interface of the currently used compiler environment to binary C UNO. - + @tplparam C interface type @param ppRet inout returned interface pointer @param x interface reference diff --git a/cppu/inc/uno/sequence2.h b/cppu/inc/uno/sequence2.h index d1a50a3743f5..16a949eea39d 100644 --- a/cppu/inc/uno/sequence2.h +++ b/cppu/inc/uno/sequence2.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ struct _typelib_TypeDescription; typedef sal_Sequence uno_Sequence; /** Assigns a sequence. - - @param ppDest destinstaion sequence - @param pSource source sequence - @param pTypeDescr type description of the sequence and NOT of an element - @param release function called each time an interface needs to + + @param ppDest destinstaion sequence + @param pSource source sequence + @param pTypeDescr type description of the sequence and NOT of an element + @param release function called each time an interface needs to be released; defaults (0) to uno */ void SAL_CALL uno_sequence_assign( @@ -55,11 +55,11 @@ void SAL_CALL uno_sequence_assign( uno_ReleaseFunc release ) SAL_THROW_EXTERN_C(); /** Assigns a sequence. - - @param ppDest destinstaion sequence - @param pSource source sequence - @param pType type of the sequence and NOT of an element - @param release function called each time an interface needs to + + @param ppDest destinstaion sequence + @param pSource source sequence + @param pType type of the sequence and NOT of an element + @param release function called each time an interface needs to be released; defaults (0) to uno */ void SAL_CALL uno_type_sequence_assign( @@ -70,14 +70,14 @@ void SAL_CALL uno_type_sequence_assign( SAL_THROW_EXTERN_C(); /** Constructs a new sequence with given elements. - - @param ppSequence out parameter sequence; + + @param ppSequence out parameter sequence; 0 if memory allocation has failed - @param pTypeDescr type description of the sequence and NOT of an + @param pTypeDescr type description of the sequence and NOT of an element - @param pElements if 0, then all elements are default constructed - @param len number of elements - @param acquire function called each time an interface needs to + @param pElements if 0, then all elements are default constructed + @param len number of elements + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno @return false, if memoray allocation has failed */ @@ -88,13 +88,13 @@ sal_Bool SAL_CALL uno_sequence_construct( uno_AcquireFunc acquire ) SAL_THROW_EXTERN_C(); /** Constructs a new sequence with given elements. - - @param ppSequence out parameter sequence; + + @param ppSequence out parameter sequence; 0 if memory allocation has failed - @param pType type of the sequence and NOT of an element - @param pElements if 0, then all elements are default constructed - @param len number of elements - @param acquire function called each time an interface needs to + @param pType type of the sequence and NOT of an element + @param pElements if 0, then all elements are default constructed + @param len number of elements + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno @return false, if memoray allocation has failed */ @@ -108,12 +108,12 @@ sal_Bool SAL_CALL uno_type_sequence_construct( /** Assures that the reference count of the given sequence is one. Otherwise a new copy of the sequence is created with a reference count of one. - - @param ppSequence inout sequence - @param pTypeDescr type description of sequence - @param acquire function called each time an interface needs to + + @param ppSequence inout sequence + @param pTypeDescr type description of sequence + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno - @param release function called each time an interface needs to + @param release function called each time an interface needs to be released; defaults (0) to uno @return false, if memoray allocation has failed */ @@ -126,12 +126,12 @@ sal_Bool SAL_CALL uno_sequence_reference2One( /** Assures that the reference count of the given sequence is one. Otherwise a new copy of the sequence is created with a reference count of one. - - @param ppSequence inout sequence - @param pType type of sequence - @param acquire function called each time an interface needs to + + @param ppSequence inout sequence + @param pType type of sequence + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno - @param release function called each time an interface needs to + @param release function called each time an interface needs to be released; defaults (0) to uno @return false, if memoray allocation has failed */ @@ -144,13 +144,13 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One( /** Reallocates length of a sequence. This truncates a sequence or enlarges it default constructing appended elements. - - @param ppSequence inout sequence - @param pTypeDescr type description of sequence - @param nSize new size of sequence - @param acquire function called each time an interface needs to + + @param ppSequence inout sequence + @param pTypeDescr type description of sequence + @param nSize new size of sequence + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno - @param release function called each time an interface needs to + @param release function called each time an interface needs to be released; defaults (0) to uno @return false, if memoray allocation has failed */ @@ -163,13 +163,13 @@ sal_Bool SAL_CALL uno_sequence_realloc( SAL_THROW_EXTERN_C(); /** Reallocates length of a sequence. This truncates a sequence or enlarges it default constructing appended elements. - - @param ppSequence inout sequence - @param pType type of sequence - @param nSize new size of sequence - @param acquire function called each time an interface needs to + + @param ppSequence inout sequence + @param pType type of sequence + @param nSize new size of sequence + @param acquire function called each time an interface needs to be acquired; defaults (0) to uno - @param release function called each time an interface needs to + @param release function called each time an interface needs to be released; defaults (0) to uno @return false, if memoray allocation has failed */ diff --git a/cppu/inc/uno/threadpool.h b/cppu/inc/uno/threadpool.h index 0c647442e377..f2acf71fe092 100644 --- a/cppu/inc/uno/threadpool.h +++ b/cppu/inc/uno/threadpool.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ extern "C" { uno_releaseIdFromCurrentThread(). This method is in general called by a bridge, that wants to bind a remote threadId to a new thread. - + @param pThreadId a byte sequence, that contains the identifier of the current thread. - @return true, when the identifier was registered. + @return true, when the identifier was registered. false, when the thread has already an identifier. The identifier was not altered. ( This is in general a bug ). - @see uno_releaseIdFromCurrentThread() + @see uno_releaseIdFromCurrentThread() */ sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) SAL_THROW_EXTERN_C(); @@ -59,8 +59,8 @@ sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) If no id has been bound for the thread before, a new one is generated and bound to the thread. For each call to uno_getIdOfCurrentThread(), a call to uno_releaseIdFromCurrentThread() - must be done. - + must be done. + @param ppThreadId [out] Contains the (acquired) ThreadId. @see uno_releaseIdFromCurrentThread() */ @@ -68,7 +68,7 @@ void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) SAL_THROW_EXTERN_C(); -/** +/** If the internal refcount drops to zero, the association betwen threadId and thread is broken. */ @@ -94,9 +94,9 @@ uno_threadpool_create() SAL_THROW_EXTERN_C(); an incoming request/reply). For every call to uno_threadpool_attach, a corrosponding call to uno_threadpool_detach must be done. - + @param hPool The bridge threadpool handle previously created by uno_threadpool_create. - + */ void SAL_CALL uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); @@ -104,7 +104,7 @@ uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); /** This method is called to wait for a reply of a previously sent request. This is a blocking method. uno_threadpool_attach() must have been called before. - + @param hPool the handle that was previously created by uno_threadpool_create(). @param ppJob [out] the pointer, that was given by uno_threadpool_putJob 0, when uno_threadpool_dispose() was the reason to fall off from threadpool. @@ -117,30 +117,30 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) /** Detaches the current thread from the threadpool. Must be called for every call to uno_threadpool_attach. -*/ +*/ void SAL_CALL uno_threadpool_detach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); /** Puts a job into the pool. A job may eiter be a request or a reply (replies have a 0 in the doRequest parameter). This function is non-blocking. - + A request may either be synchronous or asynchronous. If the request is synchronous, it is first looked up, if there exists a handle with the given identifier. If this is the case, the thread is woken up and the doRequest function is called with the given pJob. If no handle exists, a new thread is created and the given threadId is bound to the new thread. - + If the request is asynchronous, it is put into the queue of asynchronous requests for the current threadid. The requests are always executed in a new thread, even if the thread with the given id is waiting in the pool. No id is bound to the newly created thread. The responsibilty is left to the bridge ( if it wishes to bind a name). - + If pJob is a reply, there MUST be a thread with the given threadId waiting - for this reply. - + for this reply. + @param pThreadId The Id of the thread, that initialized this request. (In general a remote threadid). @param pJob The argument, that doRequest will get or that will be returned by @@ -161,16 +161,16 @@ uno_threadpool_putJob( /** All threads, that are waiting on the hPool handle, are forced out of the pool. The threads waiting with uno_threadpool_enter() will return with *ppJob == 0 - - Later calls to uno_threadpool_enter() using the hPool handle will also + + Later calls to uno_threadpool_enter() using the hPool handle will also return immeadiatly with *ppJob == 0. - + @param hPool The handle to be disposed. In case, hPool is 0, this function joins on all threads created by the threadpool administration. This may e.g. used to ensure, that no threads are inside the cppu library anymore, in case it needs to get unloaded. - + This function is called i.e. by a bridge, that is forced to dispose itself. */ void SAL_CALL diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index e3cd60b6a41d..7f440065c367 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx index 977fdba1e062..b5e12ca18d8f 100644 --- a/cppu/qa/test_recursion.cxx +++ b/cppu/qa/test_recursion.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx index 968978af92fe..b4ef870b9e12 100644 --- a/cppu/qa/test_reference.cxx +++ b/cppu/qa/test_reference.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index c7cca12ff955..d6fe948becae 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/qa/types.idl b/cppu/qa/types.idl index 0ec106ec91b2..d4011985838f 100644 --- a/cppu/qa/types.idl +++ b/cppu/qa/types.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/qa/version.map b/cppu/qa/version.map index 7321bbca16ad..f313c44bd7ad 100644 --- a/cppu/qa/version.map +++ b/cppu/qa/version.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 89647322ad6d..ab2399fcb75a 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class OuterThread; class SAL_DLLPRIVATE AffineBridge : public cppu::Enterable { public: - enum Msg + enum Msg { CB_DONE, CB_FPOINTER @@ -100,7 +100,7 @@ class SAL_DLLPRIVATE InnerThread : public osl::Thread public: InnerThread(AffineBridge * threadEnvironment) - : m_pAffineBridge(threadEnvironment) + : m_pAffineBridge(threadEnvironment) { create(); } @@ -181,7 +181,7 @@ void AffineBridge::outerDispatch(int loop) Msg mm; - do + do { // FIXME: created outer thread must not wait // in case of no message @@ -193,20 +193,20 @@ void AffineBridge::outerDispatch(int loop) mm = m_message; - switch(mm) + switch(mm) { case CB_DONE: break; - - case CB_FPOINTER: + + case CB_FPOINTER: { m_pCallee(m_pParam); - + m_message = CB_DONE; m_innerCondition.set(); break; } - default: + default: abort(); } } @@ -220,27 +220,27 @@ void AffineBridge::innerDispatch(void) Msg mm; - do + do { m_innerCondition.wait(); m_innerCondition.reset(); mm = m_message; - switch(mm) + switch(mm) { case CB_DONE: break; - - case CB_FPOINTER: + + case CB_FPOINTER: { m_pCallee(m_pParam); - + m_message = CB_DONE; m_outerCondition.set(); break; } - default: + default: abort(); } } @@ -309,14 +309,14 @@ void AffineBridge::v_enter(void) { m_innerMutex.acquire(); - if (!m_enterCount) + if (!m_enterCount) m_innerThreadId = osl_getThreadIdentifier(NULL); OSL_ASSERT(m_innerThreadId == osl_getThreadIdentifier(NULL)); ++ m_enterCount; } - + void AffineBridge::v_leave(void) { OSL_ASSERT(m_innerThreadId == osl_getThreadIdentifier(NULL)); diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index eb7c2c85e9c2..2a0f970e8af9 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,7 +105,7 @@ void LogBridge::v_enter(void) ++ m_count; } - + void LogBridge::v_leave(void) { OSL_ASSERT(m_count > 0); @@ -236,7 +236,7 @@ void LogProbe( if ( i > 0 ) rtl_logfile_trace( ","); traceValue(pParams[i].pTypeRef,pArgs[i]); - + } rtl_logfile_trace( ")"); } // if ( nParams ) diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 17ecb4646918..1e6f003a2a94 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ void UnsafeBridge::v_enter(void) ++ m_count; } - + void UnsafeBridge::v_leave(void) { OSL_ASSERT(m_count > 0); diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx index 6512bd567d71..912fb76b8619 100644 --- a/cppu/source/cppu/cppu_opt.cxx +++ b/cppu/source/cppu/cppu_opt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index 9db0182c2edc..9eec6b61c954 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ public: typelib_InterfaceTypeDescription * pTypeDescr, rtl::OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, - void * pProbeContext) + void * pProbeContext) SAL_THROW( () ); ~Proxy(void); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx index 52e77785f1ea..b0b6388f125d 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,33 +51,33 @@ #endif -extern "C" { -typedef void SAL_CALL EnvFun_P (uno_Environment *); +extern "C" { +typedef void SAL_CALL EnvFun_P (uno_Environment *); typedef void SAL_CALL EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *); typedef void SAL_CALL ExtEnv_registerProxyInterface (uno_ExtEnvironment *, void ** ppProxy, uno_freeProxyFunc freeProxy, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr); -typedef void SAL_CALL ExtEnv_revokeInterface (uno_ExtEnvironment *, +typedef void SAL_CALL ExtEnv_revokeInterface (uno_ExtEnvironment *, void * pInterface); -typedef void SAL_CALL ExtEnv_getObjectIdentifier (uno_ExtEnvironment *, - rtl_uString **, +typedef void SAL_CALL ExtEnv_getObjectIdentifier (uno_ExtEnvironment *, + rtl_uString **, void *); -typedef void SAL_CALL ExtEnv_getRegisteredInterface (uno_ExtEnvironment *, - void **, - rtl_uString *, +typedef void SAL_CALL ExtEnv_getRegisteredInterface (uno_ExtEnvironment *, + void **, + rtl_uString *, typelib_InterfaceTypeDescription *); -typedef void SAL_CALL ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment *, +typedef void SAL_CALL ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment *, void *** pppInterfaces, sal_Int32 * pnLen, uno_memAlloc memAlloc); -typedef void SAL_CALL ExtEnv_computeObjectIdentifier(uno_ExtEnvironment *, - rtl_uString ** ppOId, +typedef void SAL_CALL ExtEnv_computeObjectIdentifier(uno_ExtEnvironment *, + rtl_uString ** ppOId, void * pInterface); -typedef void SAL_CALL ExtEnv_acquireInterface (uno_ExtEnvironment *, +typedef void SAL_CALL ExtEnv_acquireInterface (uno_ExtEnvironment *, void * pInterface); -typedef void SAL_CALL ExtEnv_releaseInterface (uno_ExtEnvironment *, +typedef void SAL_CALL ExtEnv_releaseInterface (uno_ExtEnvironment *, void * pInterface); } @@ -92,20 +92,20 @@ public: void acquire (void); void release (void); - void registerProxyInterface (void ** ppProxy, - uno_freeProxyFunc freeProxy, + void registerProxyInterface (void ** ppProxy, + uno_freeProxyFunc freeProxy, rtl::OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr); void revokeInterface (void * pInterface); - void getObjectIdentifier (void * pInterface, + void getObjectIdentifier (void * pInterface, rtl::OUString * pOid); - void getRegisteredInterface (void **, - rtl::OUString const & oid, + void getRegisteredInterface (void **, + rtl::OUString const & oid, typelib_InterfaceTypeDescription *); - void getRegisteredInterfaces(void ***, + void getRegisteredInterfaces(void ***, sal_Int32 * pnLen, uno_memAlloc memAlloc); - void computeObjectIdentifier(void * pInterface, + void computeObjectIdentifier(void * pInterface, rtl::OUString * pOid); void acquireInterface (void * pInterface); void releaseInterface (void * pInterface); @@ -171,40 +171,40 @@ static void SAL_CALL s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C() } -static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment * pExtEnv, +static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment * pExtEnv, void ** ppProxy, uno_freeProxyFunc freeProxy, - rtl_uString * pOId, - typelib_InterfaceTypeDescription * pTypeDescr) + rtl_uString * pOId, + typelib_InterfaceTypeDescription * pTypeDescr) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); pBase->registerProxyInterface(ppProxy, freeProxy, pOId, pTypeDescr); } -static void SAL_CALL s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) +static void SAL_CALL s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); pBase->revokeInterface(pInterface); } -static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv, - rtl_uString ** ppOId, - void * pInterface) +static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv, + rtl_uString ** ppOId, + void * pInterface) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); pBase->getObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId)); } -static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv, +static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv, void ** ppInterface, - rtl_uString * pOId, - typelib_InterfaceTypeDescription * pTypeDescr) + rtl_uString * pOId, + typelib_InterfaceTypeDescription * pTypeDescr) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); pBase->getRegisteredInterface(ppInterface, pOId, pTypeDescr); } -static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv, +static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv, void *** pppInterface, sal_Int32 * pnLen, uno_memAlloc memAlloc) @@ -213,9 +213,9 @@ static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv, pBase->getRegisteredInterfaces(pppInterface, pnLen, memAlloc); } -static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv, - rtl_uString ** ppOId, - void * pInterface) +static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv, + rtl_uString ** ppOId, + void * pInterface) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); pBase->computeObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId)); @@ -275,7 +275,7 @@ Base::Base(uno_Environment * pEnv, cppu::Enterable * pEnterable) pEnv->pReserved = this; } -Base::~Base() +Base::~Base() { LOG_LIFECYCLE_cppu_helper_purpenv_Base_emit(fprintf(stderr, "LIFE: %s -> %p\n", "cppu::helper::purpenv::Base::~Base()", this)); @@ -324,7 +324,7 @@ void Base::releaseWeak(void) } -extern "C" { static void s_registerProxyInterface_v(va_list * pParam) +extern "C" { static void s_registerProxyInterface_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void ** ppProxy = va_arg(*pParam, void **); @@ -337,15 +337,15 @@ extern "C" { static void s_registerProxyInterface_v(va_list * pParam) pRegisterProxyInterface(pExtEnv, ppProxy, freeProxy, pOId, pTypeDescr); }} -void Base::registerProxyInterface(void ** ppProxy, - uno_freeProxyFunc freeProxy, +void Base::registerProxyInterface(void ** ppProxy, + uno_freeProxyFunc freeProxy, rtl::OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr) { - uno_Environment_invoke(m_pEnv, - s_registerProxyInterface_v, - m_pEnv->pExtEnv, - ppProxy, + uno_Environment_invoke(m_pEnv, + s_registerProxyInterface_v, + m_pEnv->pExtEnv, + ppProxy, freeProxy, oid.pData, pTypeDescr, @@ -353,7 +353,7 @@ void Base::registerProxyInterface(void ** ppPro } -extern "C" { static void s_revokeInterface_v(va_list * pParam) +extern "C" { static void s_revokeInterface_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); @@ -364,15 +364,15 @@ extern "C" { static void s_revokeInterface_v(va_list * pParam) void Base::revokeInterface(void * pInterface) { - uno_Environment_invoke(m_pEnv, - s_revokeInterface_v, - m_pEnv->pExtEnv, - pInterface, + uno_Environment_invoke(m_pEnv, + s_revokeInterface_v, + m_pEnv->pExtEnv, + pInterface, m_env_revokeInterface); } -extern "C" { static void s_getObjectIdentifier_v(va_list * pParam) +extern "C" { static void s_getObjectIdentifier_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); @@ -385,16 +385,16 @@ extern "C" { static void s_getObjectIdentifier_v(va_list * pParam) void Base::getObjectIdentifier(void * pInterface, rtl::OUString * pOid) { - uno_Environment_invoke(m_pEnv, - s_getObjectIdentifier_v, - m_pEnv->pExtEnv, - pInterface, + uno_Environment_invoke(m_pEnv, + s_getObjectIdentifier_v, + m_pEnv->pExtEnv, + pInterface, pOid, m_env_getObjectIdentifier); } -extern "C" { static void s_getRegisteredInterface_v(va_list * pParam) +extern "C" { static void s_getRegisteredInterface_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void ** ppInterface = va_arg(*pParam, void **); @@ -406,21 +406,21 @@ extern "C" { static void s_getRegisteredInterface_v(va_list * pParam) pGetRegisteredInterface(pExtEnv, ppInterface, pOId, pTypeDescr); }} -void Base::getRegisteredInterface(void ** ppInterface, +void Base::getRegisteredInterface(void ** ppInterface, rtl::OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr) { - uno_Environment_invoke(m_pEnv, - s_getRegisteredInterface_v, - m_pEnv->pExtEnv, - ppInterface, + uno_Environment_invoke(m_pEnv, + s_getRegisteredInterface_v, + m_pEnv->pExtEnv, + ppInterface, oid.pData, pTypeDescr, m_env_getRegisteredInterface); } -extern "C" { static void s_getRegisteredInterfaces_v(va_list * pParam) +extern "C" { static void s_getRegisteredInterfaces_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void *** pppInterface = va_arg(*pParam, void ***); @@ -432,21 +432,21 @@ extern "C" { static void s_getRegisteredInterfaces_v(va_list * pParam) pGetRegisteredInterfaces(pExtEnv, pppInterface, pnLen, memAlloc); }} -void Base::getRegisteredInterfaces(void *** pppInterface, +void Base::getRegisteredInterfaces(void *** pppInterface, sal_Int32 * pnLen, uno_memAlloc memAlloc) { - uno_Environment_invoke(m_pEnv, - s_getRegisteredInterfaces_v, - m_pEnv->pExtEnv, - pppInterface, + uno_Environment_invoke(m_pEnv, + s_getRegisteredInterfaces_v, + m_pEnv->pExtEnv, + pppInterface, pnLen, memAlloc, m_env_getRegisteredInterfaces); } -extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam) +extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); @@ -459,20 +459,20 @@ extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam) void Base::computeObjectIdentifier(void * pInterface, rtl::OUString * pOid) { - uno_Environment_invoke(m_pEnv, - s_computeObjectIdentifier_v, - m_pEnv->pExtEnv, - pInterface, + uno_Environment_invoke(m_pEnv, + s_computeObjectIdentifier_v, + m_pEnv->pExtEnv, + pInterface, pOid, m_env_computeObjectIdentifier); } -extern "C" { static void s_acquireInterface_v(va_list * pParam) +extern "C" { static void s_acquireInterface_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); - ExtEnv_acquireInterface * pAcquireInterface + ExtEnv_acquireInterface * pAcquireInterface = va_arg(*pParam, ExtEnv_acquireInterface *); pAcquireInterface(pExtEnv, pInterface); @@ -484,7 +484,7 @@ void Base::acquireInterface(void * pInterface) } -extern "C" { static void s_releaseInterface_v(va_list * pParam) +extern "C" { static void s_releaseInterface_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); @@ -496,10 +496,10 @@ extern "C" { static void s_releaseInterface_v(va_list * pParam) void Base::releaseInterface(void * pInterface) { - uno_Environment_invoke(m_pEnv, - s_releaseInterface_v, - m_pEnv->pExtEnv, - pInterface, + uno_Environment_invoke(m_pEnv, + s_releaseInterface_v, + m_pEnv->pExtEnv, + pInterface, m_env_releaseInterface); } @@ -523,7 +523,7 @@ void Base::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) m_pEnterable->callOut_v(pCallee, pParam); } -int Base::v_isValid(rtl::OUString * pReason) +int Base::v_isValid(rtl::OUString * pReason) { return m_pEnterable->isValid(pReason); } diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index 9c87f82cf470..a299e1eb1dbc 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ class Mapping : public uno_Mapping void * m_pContext; public: - explicit Mapping(uno_Environment * pFrom, + explicit Mapping(uno_Environment * pFrom, uno_Environment * pTo, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext); @@ -114,7 +114,7 @@ static void s_getIdentifier_v(va_list * pParam) uno_ExtEnvironment * pEnv = va_arg(*pParam, uno_ExtEnvironment *); rtl_uString ** ppOid = va_arg(*pParam, rtl_uString **); uno_Interface * pUnoI = va_arg(*pParam, uno_Interface *); - + pEnv->getObjectIdentifier(pEnv, ppOid, pUnoI); } @@ -126,7 +126,7 @@ static void SAL_CALL s_free(uno_Mapping * puno_Mapping) } } -Mapping::Mapping(uno_Environment * pFrom, +Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext @@ -185,14 +185,14 @@ void Mapping::mapInterface( pOId, m_probeFun, m_pContext); - + // proxy may be exchanged during registration m_to.get()->pExtEnv->registerProxyInterface(m_to.get()->pExtEnv, (void **)&pProxy, Proxy_free, pOId, pTypeDescr); - + *ppOut = pProxy; } @@ -210,9 +210,9 @@ void Mapping::acquire() SAL_THROW(()) } } -void Mapping::release() SAL_THROW(()) +void Mapping::release() SAL_THROW(()) { - if (osl_decrementInterlockedCount(&m_nCount) == 0) + if (osl_decrementInterlockedCount(&m_nCount) == 0) ::uno_revokeMapping(this); } diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index c5651b007686..ecf6bcd56726 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,12 +51,12 @@ using namespace com::sun::star; -static bool relatesToInterface(typelib_TypeDescription * pTypeDescr) +static bool relatesToInterface(typelib_TypeDescription * pTypeDescr) SAL_THROW( () ) { switch (pTypeDescr->eTypeClass) { -// case typelib_TypeClass_TYPEDEF: +// case typelib_TypeClass_TYPEDEF: case typelib_TypeClass_SEQUENCE: { switch (((typelib_IndirectTypeDescription *)pTypeDescr)->pType->eTypeClass) @@ -94,7 +94,7 @@ static bool relatesToInterface(typelib_TypeDescription * pTypeDescr) case typelib_TypeClass_UNION: // might relate to interface case typelib_TypeClass_ANY: // might relate to interface return true; -// case typelib_TypeClass_TYPEDEF: +// case typelib_TypeClass_TYPEDEF: case typelib_TypeClass_SEQUENCE: case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: @@ -130,7 +130,7 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch( typelib_TypeDescription const * pMemberType, void * pReturn, void * pArgs[], - uno_Any ** ppException) + uno_Any ** ppException) SAL_THROW_EXTERN_C() { Proxy * pThis = static_cast<Proxy *>(pUnoI); @@ -204,7 +204,7 @@ static void SAL_CALL s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C() pProxy->release(); } -static void s_acquireAndRegister_v(va_list * pParam) +static void s_acquireAndRegister_v(va_list * pParam) { uno_Interface * pUnoI = va_arg(*pParam, uno_Interface *); rtl_uString * pOid = va_arg(*pParam, rtl_uString *); @@ -224,7 +224,7 @@ Proxy::Proxy(uno::Mapping const & to_from, rtl::OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext -) +) SAL_THROW(()) : m_nRef (1), m_from (pFrom), @@ -253,7 +253,7 @@ Proxy::Proxy(uno::Mapping const & to_from, uno_Interface::pDispatcher = s_Proxy_dispatch; } -extern "C" { static void s_releaseAndRevoke_v(va_list * pParam) +extern "C" { static void s_releaseAndRevoke_v(va_list * pParam) { uno_ExtEnvironment * pEnv = va_arg(*pParam, uno_ExtEnvironment *); uno_Interface * pUnoI = va_arg(*pParam, uno_Interface *); @@ -271,7 +271,7 @@ Proxy::~Proxy() typelib_typedescription_release((typelib_TypeDescription *)m_pTypeDescr); } -static uno::TypeDescription getAcquireMethod(void) +static uno::TypeDescription getAcquireMethod(void) { typelib_TypeDescriptionReference * type_XInterface = * typelib_static_type_getByTypeClass(typelib_TypeClass_INTERFACE); @@ -286,7 +286,7 @@ static uno::TypeDescription getAcquireMethod(void) return acquire; } -static uno::TypeDescription getReleaseMethod(void) +static uno::TypeDescription getReleaseMethod(void) { typelib_TypeDescriptionReference * type_XInterface = * typelib_static_type_getByTypeClass(typelib_TypeClass_INTERFACE); @@ -309,7 +309,7 @@ void Proxy::acquire(void) if (m_probeFun) m_probeFun(true, this, - m_pProbeContext, + m_pProbeContext, *typelib_static_type_getByTypeClass(typelib_TypeClass_VOID), NULL, 0, @@ -333,7 +333,7 @@ void Proxy::acquire(void) if (m_probeFun) m_probeFun(false, this, - m_pProbeContext, + m_pProbeContext, *typelib_static_type_getByTypeClass(typelib_TypeClass_VOID), NULL, 0, @@ -344,7 +344,7 @@ void Proxy::acquire(void) } -void Proxy::release(void) +void Proxy::release(void) { cppu::helper::purpenv::ProbeFun * probeFun = m_probeFun; void * pProbeContext = m_pProbeContext; @@ -352,7 +352,7 @@ void Proxy::release(void) if (m_probeFun) m_probeFun(true, this, - m_pProbeContext, + m_pProbeContext, *typelib_static_type_getByTypeClass(typelib_TypeClass_VOID), NULL, 0, @@ -367,7 +367,7 @@ void Proxy::release(void) if (probeFun) probeFun(false, this, - pProbeContext, + pProbeContext, *typelib_static_type_getByTypeClass(typelib_TypeClass_VOID), NULL, 0, @@ -411,7 +411,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, if (m_probeFun) m_probeFun(true, this, - m_pProbeContext, + m_pProbeContext, pReturnTypeRef, pParams, nParams, @@ -424,7 +424,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, typelib_TypeDescription * return_td = 0; void * ret = pReturn; - if (pReturnTypeRef) + if (pReturnTypeRef) { TYPELIB_DANGER_GET(&return_td, pReturnTypeRef); @@ -483,9 +483,9 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, } if (ret != pReturn) { - uno_type_copyAndConvertData(pReturn, - ret, - pReturnTypeRef, + uno_type_copyAndConvertData(pReturn, + ret, + pReturnTypeRef, m_to_from.get()); uno_Environment_invoke(m_to.get(), s_type_destructData_v, ret, pReturnTypeRef, 0); @@ -507,9 +507,9 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, } } - uno_type_any_constructAndConvert(*ppException, - exc->pData, - exc->pType, + uno_type_any_constructAndConvert(*ppException, + exc->pData, + exc->pType, m_to_from.get()); // FIXME: need to destruct in m_to @@ -519,7 +519,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, if (m_probeFun) m_probeFun(false, this, - m_pProbeContext, + m_pProbeContext, pReturnTypeRef, pParams, nParams, diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 2ffabcbff014..6fad817494cd 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext() if (0 == s_type_XCurrentContext) { OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext") ); - typelib_InterfaceTypeDescription * pTD = 0; + typelib_InterfaceTypeDescription * pTD = 0; typelib_TypeDescriptionReference * pMembers[1] = { 0 }; OUString sMethodName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext::getValueByName") ); @@ -81,10 +81,10 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext() * typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE ), 1, pMembers ); - + typelib_typedescription_register( (typelib_TypeDescription**)&pTD ); typelib_typedescriptionreference_release( pMembers[0] ); - + typelib_InterfaceMethodTypeDescription * pMethod = 0; typelib_Parameter_Init aParameters[1]; OUString sParamName0( RTL_CONSTASCII_USTRINGPARAM("Name") ); @@ -121,13 +121,13 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext() //================================================================================================== class ThreadKey { - sal_Bool _bInit; + sal_Bool _bInit; oslThreadKey _hThreadKey; oslThreadKeyCallbackFunction _pCallback; - + public: inline oslThreadKey getThreadKey() SAL_THROW( () ); - + inline ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW( () ); inline ~ThreadKey() SAL_THROW( () ); }; @@ -186,7 +186,7 @@ IdContainer * getIdContainer() SAL_THROW( () ) { static ThreadKey s_key( delete_IdContainer ); oslThreadKey aKey = s_key.getThreadKey(); - + IdContainer * pId = reinterpret_cast< IdContainer * >( ::osl_getThreadKeyData( aKey ) ); if (! pId) { @@ -209,7 +209,7 @@ extern "C" sal_Bool SAL_CALL uno_setCurrentContext( { IdContainer * pId = getIdContainer(); OSL_ASSERT( pId ); - + // free old one if (pId->pCurrentContext) { @@ -221,7 +221,7 @@ extern "C" sal_Bool SAL_CALL uno_setCurrentContext( pId->pCurrentContext = 0; } - + if (pCurrentContext) { uno_Environment * pEnv = 0; @@ -256,7 +256,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( { IdContainer * pId = getIdContainer(); OSL_ASSERT( pId ); - + Environment target_env; // release inout parameter @@ -274,11 +274,11 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( *ppCurrentContext = 0; } - + // case: null-ref if (0 == pId->pCurrentContext) return sal_True; - + if (! target_env.is()) { target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext); @@ -286,7 +286,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( if (! target_env.is()) return sal_False; } - + Mapping mapping((uno_Environment *) pId->pCurrentContextEnv, target_env.get()); OSL_ASSERT( mapping.is() ); if (! mapping.is()) diff --git a/cppu/source/threadpool/current.hxx b/cppu/source/threadpool/current.hxx index 45640220116d..cf9b04b1cf3e 100644 --- a/cppu/source/threadpool/current.hxx +++ b/cppu/source/threadpool/current.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ struct IdContainer void * pCurrentContext; uno_ExtEnvironment * pCurrentContextEnv; // - sal_Bool bInit; - sal_Sequence * pLocalThreadId; - sal_Int32 nRefCountOfCurrentId; - sal_Sequence * pCurrentId; + sal_Bool bInit; + sal_Sequence * pLocalThreadId; + sal_Int32 nRefCountOfCurrentId; + sal_Sequence * pCurrentId; }; IdContainer * getIdContainer() SAL_THROW( () ); diff --git a/cppu/source/threadpool/jobqueue.cxx b/cppu/source/threadpool/jobqueue.cxx index 92bd7cf97607..6db0d68d5102 100644 --- a/cppu/source/threadpool/jobqueue.cxx +++ b/cppu/source/threadpool/jobqueue.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,22 +36,22 @@ using namespace ::osl; namespace cppu_threadpool { - + JobQueue::JobQueue() : m_nToDo( 0 ), m_bSuspended( sal_False ), m_cndWait( osl_createCondition() ) { - osl_resetCondition( m_cndWait ); + osl_resetCondition( m_cndWait ); m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance(); } - + JobQueue::~JobQueue() { osl_destroyCondition( m_cndWait ); } - - + + void JobQueue::add( void *pThreadSpecificData, RequestFun * doRequest ) { MutexGuard guard( m_mutex ); @@ -63,7 +63,7 @@ namespace cppu_threadpool { } m_nToDo ++; } - + void *JobQueue::enter( sal_Int64 nDisposeId , sal_Bool bReturnWhenNoJob ) { void *pReturn = 0; @@ -77,7 +77,7 @@ namespace cppu_threadpool { m_lstCallstack.push_front( nDisposeId ); } - + while( sal_True ) { if( bReturnWhenNoJob ) @@ -90,7 +90,7 @@ namespace cppu_threadpool { } osl_waitCondition( m_cndWait , 0 ); - + struct Job job={0,0}; { // synchronize with add and dispose calls @@ -132,10 +132,10 @@ namespace cppu_threadpool { MutexGuard guard( m_mutex ); m_lstCallstack.pop_front(); } - + return pReturn; } - + void JobQueue::dispose( sal_Int64 nDisposeId ) { MutexGuard guard( m_mutex ); @@ -155,7 +155,7 @@ namespace cppu_threadpool { osl_setCondition( m_cndWait ); } } - + void JobQueue::suspend() { MutexGuard guard( m_mutex ); diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx index bfeef9b4a576..7016fc028d25 100644 --- a/cppu/source/threadpool/jobqueue.hxx +++ b/cppu/source/threadpool/jobqueue.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,16 +40,16 @@ namespace cppu_threadpool { extern "C" typedef void (SAL_CALL RequestFun)(void *); - + struct Job { void *pThreadSpecificData; RequestFun * doRequest; }; + + typedef ::std::list < struct Job > JobList; - typedef ::std::list < struct Job > JobList; - - typedef ::std::list < sal_Int64 > CallStackList; + typedef ::std::list < sal_Int64 > CallStackList; class DisposedCallerAdmin; typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; @@ -59,9 +59,9 @@ namespace cppu_threadpool public: JobQueue(); ~JobQueue(); - + void add( void *pThreadSpecificData, RequestFun * doRequest ); - + void *enter( sal_Int64 nDisposeId , sal_Bool bReturnWhenNoJob = sal_False ); void dispose( sal_Int64 nDisposeId ); @@ -71,7 +71,7 @@ namespace cppu_threadpool sal_Bool isEmpty(); sal_Bool isCallstackEmpty(); sal_Bool isBusy(); - + private: ::osl::Mutex m_mutex; JobList m_lstJob; @@ -83,6 +83,6 @@ namespace cppu_threadpool }; } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index c6035f0754c7..5a849a331b39 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,8 +149,8 @@ namespace cppu_threadpool { sal_Bool ORequestThread::create() { - OSL_ASSERT(m_thread == 0); // only one running thread per instance - + OSL_ASSERT(m_thread == 0); // only one running thread per instance + m_thread = osl_createSuspendedThread( cppu_requestThreadWorker, (void*)this); if ( m_thread ) { diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx index bbef51eabca4..7ece3b5f0e9f 100644 --- a/cppu/source/threadpool/thread.hxx +++ b/cppu/source/threadpool/thread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace cppu_threadpool { class JobQueue; class ThreadAdmin; typedef boost::shared_ptr<ThreadAdmin> ThreadAdminHolder; - + //----------------------------------------- // private thread class for the threadpool // independent from vos @@ -54,14 +54,14 @@ namespace cppu_threadpool { ~ORequestThread(); void setTask( JobQueue * , const ::rtl::ByteSequence & aThreadId , sal_Bool bAsynchron ); - + sal_Bool create(); void join(); void onTerminated(); void run(); inline void setDeleteSelf( sal_Bool b ) { m_bDeleteSelf = b; } - + private: oslThread m_thread; ThreadAdminHolder m_aThreadAdmin; @@ -88,6 +88,6 @@ namespace cppu_threadpool { } // end cppu_threadpool -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx index 50fef43f57b4..d9a933ef023a 100644 --- a/cppu/source/threadpool/threadident.cxx +++ b/cppu/source/threadpool/threadident.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index d56999c7a74c..42dd870896ae 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx index 75cdd18882d1..db849099ef67 100644 --- a/cppu/source/threadpool/threadpool.hxx +++ b/cppu/source/threadpool/threadpool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace cppu_threadpool { struct HashThreadId { - sal_Int32 operator () ( const ::rtl::ByteSequence &a ) const + sal_Int32 operator () ( const ::rtl::ByteSequence &a ) const { if( a.getLength() >= 4 ) { @@ -60,33 +60,33 @@ namespace cppu_threadpool { } }; - typedef ::std::hash_map + typedef ::std::hash_map < - ByteSequence, // ThreadID + ByteSequence, // ThreadID ::std::pair < JobQueue * , JobQueue * >, HashThreadId, EqualThreadId > ThreadIdHashMap; - typedef ::std::list < sal_Int64 > DisposedCallerList; - + typedef ::std::list < sal_Int64 > DisposedCallerList; + struct WaitingThread { oslCondition condition; ORequestThread *thread; }; - - typedef ::std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList; + + typedef ::std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList; class DisposedCallerAdmin; typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; - + class DisposedCallerAdmin { public: ~DisposedCallerAdmin(); - + static DisposedCallerAdminHolder getInstance(); void dispose( sal_Int64 nDisposeId ); @@ -107,10 +107,10 @@ namespace cppu_threadpool { ThreadPool(); ~ThreadPool(); static ThreadPoolHolder getInstance(); - + void dispose( sal_Int64 nDisposeId ); void stopDisposing( sal_Int64 nDisposeId ); - + void addJob( const ByteSequence &aThreadId, sal_Bool bAsynchron, void *pThreadSpecificData, @@ -123,15 +123,15 @@ namespace cppu_threadpool { * @return true, if queue could be succesfully revoked. ********/ sal_Bool revokeQueue( const ByteSequence & aThreadId , sal_Bool bAsynchron ); - + void waitInPool( ORequestThread *pThread ); private: - void createThread( JobQueue *pQueue, const ByteSequence &aThreadId, sal_Bool bAsynchron); - + void createThread( JobQueue *pQueue, const ByteSequence &aThreadId, sal_Bool bAsynchron); + ThreadIdHashMap m_mapQueue; ::osl::Mutex m_mutex; - + ::osl::Mutex m_mutexWaitingThreadList; WaitingThreadList m_lstThreads; diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 9aa9afcf648f..5cb19e266ba0 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ void SAL_CALL typelib_typedescriptionreference_getByName( /** * The double member determin the alignment. - * Under Os2 and MS-Windows the Alignment is min( 8, sizeof( type ) ). + * Under Os2 and MS-Windows the Alignment is min( 8, sizeof( type ) ). * The aligment of a strukture is min( 8, sizeof( max basic type ) ), the greatest basic type * determine the aligment. */ @@ -97,7 +97,7 @@ struct AlignSize_Impl #pragma pack() #endif -// the value of the maximal alignment +// the value of the maximal alignment static sal_Int32 nMaxAlignment = (sal_Int32)( (sal_Size)(&((AlignSize_Impl *) 16)->dDouble) - 16); static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment ) @@ -153,7 +153,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - + if (! s_aTypes[eTypeClass]) { MutexGuard aGuard( typelib_StaticInitMutex::get() ); @@ -164,7 +164,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( "short", "unsigned short", "long", "unsigned long", "hyper", "unsigned hyper", "float", "double", "string", "type", "any" }; - + switch (eTypeClass) { case typelib_TypeClass_EXCEPTION: @@ -201,9 +201,9 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( if (! s_aTypes[typelib_TypeClass_INTERFACE]) { OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface") ); - + typelib_InterfaceTypeDescription * pTD = 0; - + typelib_TypeDescriptionReference * pMembers[3] = { 0,0,0 }; OUString sMethodName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::queryInterface") ); ::typelib_typedescriptionreference_new( @@ -214,18 +214,18 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( OUString sMethodName2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::release") ); ::typelib_typedescriptionreference_new( &pMembers[2], typelib_TypeClass_INTERFACE_METHOD, sMethodName2.pData ); - + ::typelib_typedescription_newInterface( &pTD, sTypeName.pData, 0xe227a391, 0x33d6, 0x11d1, 0xaabe00a0, 0x249d5590, 0, 3, pMembers ); - + ::typelib_typedescription_register( (typelib_TypeDescription **)&pTD ); ::typelib_typedescriptionreference_acquire( s_aTypes[typelib_TypeClass_INTERFACE] = ((typelib_TypeDescription *)pTD)->pWeakRef ); // another static ref: ++s_aTypes[typelib_TypeClass_INTERFACE]->nStaticRefCount; ::typelib_typedescription_release( (typelib_TypeDescription*)pTD ); - + ::typelib_typedescriptionreference_release( pMembers[0] ); ::typelib_typedescriptionreference_release( pMembers[1] ); ::typelib_typedescriptionreference_release( pMembers[2] ); @@ -234,7 +234,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( { typelib_TypeDescription * pTD1 = 0; OUString sTypeName1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception") ); - + typelib_CompoundMember_Init aMembers[2]; OUString sMemberType0( RTL_CONSTASCII_USTRINGPARAM("string") ); OUString sMemberName0( RTL_CONSTASCII_USTRINGPARAM("Message") ); @@ -246,7 +246,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( aMembers[1].eTypeClass = typelib_TypeClass_INTERFACE; aMembers[1].pTypeName = sMemberType1.pData; aMembers[1].pMemberName = sMemberName1.pData; - + ::typelib_typedescription_new( &pTD1, typelib_TypeClass_EXCEPTION, sTypeName1.pData, 0, 2, aMembers ); typelib_typedescription_register( &pTD1 ); @@ -280,13 +280,13 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( typelib_TypeClass_ANY, sReturnType0.pData, 1, aParameters, 1, pExceptions ); ::typelib_typedescription_register( (typelib_TypeDescription**)&pMethod ); - + OUString sReturnType1( RTL_CONSTASCII_USTRINGPARAM("void") ); ::typelib_typedescription_newInterfaceMethod( &pMethod, 1, sal_True, sMethodName1.pData, typelib_TypeClass_VOID, sReturnType1.pData, 0, 0, 0, 0 ); ::typelib_typedescription_register( (typelib_TypeDescription**)&pMethod ); - + ::typelib_typedescription_newInterfaceMethod( &pMethod, 2, sal_True, sMethodName2.pData, typelib_TypeClass_VOID, sReturnType1.pData, @@ -322,7 +322,7 @@ void SAL_CALL typelib_static_type_init( { OUString aTypeName( OUString::createFromAscii( pTypeName ) ); ::typelib_typedescriptionreference_new( ppRef, eTypeClass, aTypeName.pData ); - + // another static ref: ++((*ppRef)->nStaticRefCount); } @@ -344,7 +344,7 @@ void SAL_CALL typelib_static_sequence_type_init( aBuf.appendAscii( "[]" ); aBuf.append( pElementType->pTypeName ); OUString aTypeName( aBuf.makeStringAndClear() ); - + OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_SEQUENCE) ); *ppRef = igetTypeByName( aTypeName.pData ); if (!*ppRef) @@ -353,7 +353,7 @@ void SAL_CALL typelib_static_sequence_type_init( ::typelib_typedescription_new( &pReg, typelib_TypeClass_SEQUENCE, aTypeName.pData, pElementType, 0, 0 ); - + ::typelib_typedescription_register( &pReg ); *ppRef = (typelib_TypeDescriptionReference *)pReg; OSL_ASSERT( *ppRef == pReg->pWeakRef ); @@ -376,7 +376,7 @@ void init( { OSL_ENSURE( typelib_TypeClass_STRUCT == eTypeClass || typelib_TypeClass_EXCEPTION == eTypeClass, "### unexpected type class!" ); - + if (! *ppRef) { MutexGuard aGuard( typelib_StaticInitMutex::get() ); @@ -400,7 +400,7 @@ void init( nOffset = ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize; OSL_ENSURE( newAlignedSize( 0, ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize, ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nAlignment ) == ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize, "### unexpected offset!" ); } - + if (nMembers) { pComp->nMembers = nMembers; @@ -430,14 +430,14 @@ void init( } } } - + typelib_TypeDescription * pReg = (typelib_TypeDescription *)pComp; pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg; // sizeof( void ) not allowed pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment ); pReg->nAlignment = adjustAlignment( pReg->nAlignment ); pReg->bComplete = sal_False; - + ::typelib_typedescription_register( &pReg ); *ppRef = (typelib_TypeDescriptionReference *)pReg; OSL_ASSERT( *ppRef == pReg->pWeakRef ); @@ -504,7 +504,7 @@ void SAL_CALL typelib_static_mi_interface_type_init( typelib_InterfaceTypeDescription * pIface = 0; ::typelib_typedescription_newEmpty( (typelib_TypeDescription **)&pIface, typelib_TypeClass_INTERFACE, aTypeName.pData ); - + pIface->nBaseTypes = std::max< sal_Int32 >(nBaseTypes, 1); pIface->ppBaseTypes = new typelib_InterfaceTypeDescription *[ pIface->nBaseTypes]; @@ -528,15 +528,15 @@ void SAL_CALL typelib_static_mi_interface_type_init( pIface->pBaseTypeDescription = pIface->ppBaseTypes[0]; typelib_typedescription_acquire( &pIface->pBaseTypeDescription->aBase); - + typelib_TypeDescription * pReg = (typelib_TypeDescription *)pIface; pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg; // sizeof( void ) not allowed pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment ); - + pReg->nAlignment = adjustAlignment( pReg->nAlignment ); pReg->bComplete = sal_False; - + ::typelib_typedescription_register( &pReg ); *ppRef = (typelib_TypeDescriptionReference *)pReg; OSL_ASSERT( *ppRef == pReg->pWeakRef ); @@ -568,15 +568,15 @@ void SAL_CALL typelib_static_enum_type_init( ::typelib_typedescription_newEmpty( &pReg, typelib_TypeClass_ENUM, aTypeName.pData ); typelib_EnumTypeDescription * pEnum = (typelib_EnumTypeDescription *)pReg; - + pEnum->nDefaultEnumValue = nDefaultValue; - + pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg; // sizeof( void ) not allowed pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment ); pReg->nAlignment = ::adjustAlignment( pReg->nAlignment ); pReg->bComplete = sal_False; - + ::typelib_typedescription_register( &pReg ); *ppRef = (typelib_TypeDescriptionReference *)pReg; OSL_ASSERT( *ppRef == pReg->pWeakRef ); @@ -591,7 +591,7 @@ void SAL_CALL typelib_static_enum_type_init( void SAL_CALL typelib_static_array_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeDescriptionReference * pElementTypeRef, - sal_Int32 nDimensions, ... ) + sal_Int32 nDimensions, ... ) SAL_THROW_EXTERN_C() { if (! *ppRef) @@ -601,7 +601,7 @@ void SAL_CALL typelib_static_array_type_init( { OUStringBuffer aBuf( 32 ); aBuf.append( pElementTypeRef->pTypeName ); - + va_list dimArgs; va_start( dimArgs, nDimensions ); sal_Int32 dim = 0; @@ -618,7 +618,7 @@ void SAL_CALL typelib_static_array_type_init( } va_end( dimArgs ); OUString aTypeName( aBuf.makeStringAndClear() ); - + OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_ARRAY) ); *ppRef = igetTypeByName( aTypeName.pData ); if (!*ppRef) @@ -627,20 +627,20 @@ void SAL_CALL typelib_static_array_type_init( ::typelib_typedescription_newEmpty( &pReg, typelib_TypeClass_ARRAY, aTypeName.pData ); typelib_ArrayTypeDescription * pArray = (typelib_ArrayTypeDescription *)pReg; - + pArray->nDimensions = nDimensions; pArray->nTotalElements = nElements; pArray->pDimensions = pDimensions; typelib_typedescriptionreference_acquire(pElementTypeRef); ((typelib_IndirectTypeDescription*)pArray)->pType = pElementTypeRef; - + pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg; // sizeof( void ) not allowed pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment ); pReg->nAlignment = ::adjustAlignment( pReg->nAlignment ); pReg->bComplete = sal_True; - + ::typelib_typedescription_register( &pReg ); *ppRef = (typelib_TypeDescriptionReference *)pReg; OSL_ASSERT( *ppRef == pReg->pWeakRef ); diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index c248af3228e5..738f35d3c5f2 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" - + #include <hash_map> #include <list> #include <set> @@ -208,15 +208,15 @@ static sal_Int32 nCacheSize = 256; */ struct TypeDescriptor_Init_Impl { - //sal_Bool bDesctructorCalled; + //sal_Bool bDesctructorCalled; // all type description references - WeakMap_Impl * pWeakMap; + WeakMap_Impl * pWeakMap; // all type description callbacks - CallbackSet_Impl * pCallbacks; + CallbackSet_Impl * pCallbacks; // A cache to hold descriptions - TypeDescriptionList_Impl * pCache; + TypeDescriptionList_Impl * pCache; // The mutex to guard all type library accesses - Mutex * pMutex; + Mutex * pMutex; inline Mutex & getMutex() SAL_THROW( () ); @@ -224,16 +224,16 @@ struct TypeDescriptor_Init_Impl #if OSL_DEBUG_LEVEL > 1 // only for debugging - sal_Int32 nTypeDescriptionCount; - sal_Int32 nCompoundTypeDescriptionCount; - sal_Int32 nUnionTypeDescriptionCount; - sal_Int32 nIndirectTypeDescriptionCount; - sal_Int32 nArrayTypeDescriptionCount; - sal_Int32 nEnumTypeDescriptionCount; - sal_Int32 nInterfaceMethodTypeDescriptionCount; - sal_Int32 nInterfaceAttributeTypeDescriptionCount; - sal_Int32 nInterfaceTypeDescriptionCount; - sal_Int32 nTypeDescriptionReferenceCount; + sal_Int32 nTypeDescriptionCount; + sal_Int32 nCompoundTypeDescriptionCount; + sal_Int32 nUnionTypeDescriptionCount; + sal_Int32 nIndirectTypeDescriptionCount; + sal_Int32 nArrayTypeDescriptionCount; + sal_Int32 nEnumTypeDescriptionCount; + sal_Int32 nInterfaceMethodTypeDescriptionCount; + sal_Int32 nInterfaceAttributeTypeDescriptionCount; + sal_Int32 nInterfaceTypeDescriptionCount; + sal_Int32 nTypeDescriptionReferenceCount; #endif ~TypeDescriptor_Init_Impl() SAL_THROW( () ); }; @@ -340,15 +340,15 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) pWeakMap = 0; } #if OSL_DEBUG_LEVEL > 1 - OSL_ASSERT( nTypeDescriptionCount == 0 ); - OSL_ASSERT( nCompoundTypeDescriptionCount == 0 ); - OSL_ASSERT( nUnionTypeDescriptionCount == 0 ); - OSL_ASSERT( nIndirectTypeDescriptionCount == 0 ); - OSL_ASSERT( nArrayTypeDescriptionCount == 0 ); - OSL_ASSERT( nEnumTypeDescriptionCount == 0 ); - OSL_ASSERT( nInterfaceMethodTypeDescriptionCount == 0 ); - OSL_ASSERT( nInterfaceAttributeTypeDescriptionCount == 0 ); - OSL_ASSERT( nInterfaceTypeDescriptionCount == 0 ); + OSL_ASSERT( nTypeDescriptionCount == 0 ); + OSL_ASSERT( nCompoundTypeDescriptionCount == 0 ); + OSL_ASSERT( nUnionTypeDescriptionCount == 0 ); + OSL_ASSERT( nIndirectTypeDescriptionCount == 0 ); + OSL_ASSERT( nArrayTypeDescriptionCount == 0 ); + OSL_ASSERT( nEnumTypeDescriptionCount == 0 ); + OSL_ASSERT( nInterfaceMethodTypeDescriptionCount == 0 ); + OSL_ASSERT( nInterfaceAttributeTypeDescriptionCount == 0 ); + OSL_ASSERT( nInterfaceTypeDescriptionCount == 0 ); OSL_ASSERT( nTypeDescriptionReferenceCount == 0 ); OSL_ASSERT( !pCallbacks || pCallbacks->empty() ); @@ -376,7 +376,7 @@ extern "C" void SAL_CALL typelib_typedescription_registerCallback( { // todo mt safe: guard is no solution, can not acquire while calling callback! TypeDescriptor_Init_Impl &rInit = Init::get(); -// OslGuard aGuard( rInit.getMutex() ); +// OslGuard aGuard( rInit.getMutex() ); if( !rInit.pCallbacks ) rInit.pCallbacks = new CallbackSet_Impl; rInit.pCallbacks->push_back( CallbackEntry( pContext, pCallback ) ); @@ -391,7 +391,7 @@ extern "C" void SAL_CALL typelib_typedescription_revokeCallback( if( rInit.pCallbacks ) { // todo mt safe: guard is no solution, can not acquire while calling callback! -// OslGuard aGuard( rInit.getMutex() ); +// OslGuard aGuard( rInit.getMutex() ); CallbackEntry aEntry( pContext, pCallback ); CallbackSet_Impl::iterator iPos( rInit.pCallbacks->begin() ); while (!(iPos == rInit.pCallbacks->end())) @@ -700,9 +700,9 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty( &Init::get().nEnumTypeDescriptionCount ); #endif pTmp->nDefaultEnumValue = 0; - pTmp->nEnumValues = 0; - pTmp->ppEnumNames = 0; - pTmp->pEnumValues = 0; + pTmp->nEnumValues = 0; + pTmp->ppEnumNames = 0; + pTmp->pEnumValues = 0; } break; @@ -1010,13 +1010,13 @@ extern "C" void SAL_CALL typelib_typedescription_newEnum( typelib_EnumTypeDescription * pEnum = (typelib_EnumTypeDescription *)*ppRet; pEnum->nDefaultEnumValue = nDefaultValue; - pEnum->nEnumValues = nEnumValues; - pEnum->ppEnumNames = new rtl_uString * [ nEnumValues ]; + pEnum->nEnumValues = nEnumValues; + pEnum->ppEnumNames = new rtl_uString * [ nEnumValues ]; for ( sal_Int32 nPos = nEnumValues; nPos--; ) { rtl_uString_acquire( pEnum->ppEnumNames[nPos] = ppEnumNames[nPos] ); } - pEnum->pEnumValues = new sal_Int32[ nEnumValues ]; + pEnum->pEnumValues = new sal_Int32[ nEnumValues ]; ::memcpy( pEnum->pEnumValues, pEnumValues, nEnumValues * sizeof(sal_Int32) ); (*ppRet)->pWeakRef = (typelib_TypeDescriptionReference *)*ppRet; @@ -2572,17 +2572,17 @@ extern "C" void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize ) static sal_Bool s_aAssignableFromTab[11][11] = { /* from CH,BO,BY,SH,US,LO,UL,HY,UH,FL,DO */ -/* TypeClass_CHAR */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -/* TypeClass_BOOLEAN */ { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -/* TypeClass_BYTE */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, -/* TypeClass_SHORT */ { 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 }, -/* TypeClass_UNSIGNED_SHORT */ { 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 }, -/* TypeClass_LONG */ { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 }, -/* TypeClass_UNSIGNED_LONG */ { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 }, -/* TypeClass_HYPER */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 }, -/* TypeClass_UNSIGNED_HYPER */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 }, -/* TypeClass_FLOAT */ { 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0 }, -/* TypeClass_DOUBLE */ { 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1 } +/* TypeClass_CHAR */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +/* TypeClass_BOOLEAN */ { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +/* TypeClass_BYTE */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, +/* TypeClass_SHORT */ { 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 }, +/* TypeClass_UNSIGNED_SHORT */ { 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 }, +/* TypeClass_LONG */ { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 }, +/* TypeClass_UNSIGNED_LONG */ { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 }, +/* TypeClass_HYPER */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 }, +/* TypeClass_UNSIGNED_HYPER */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 }, +/* TypeClass_FLOAT */ { 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0 }, +/* TypeClass_DOUBLE */ { 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1 } }; //################################################################################################## @@ -2594,7 +2594,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom( if (pAssignable && pFrom) { typelib_TypeClass eAssignable = pAssignable->eTypeClass; - typelib_TypeClass eFrom = pFrom->eTypeClass; + typelib_TypeClass eFrom = pFrom->eTypeClass; if (eAssignable == typelib_TypeClass_ANY) // anything can be assigned to an any .) return sal_True; diff --git a/cppu/source/uno/EnvDcp.c b/cppu/source/uno/EnvDcp.c index a9d6dc3d59c7..f73dc46d630d 100644 --- a/cppu/source/uno/EnvDcp.c +++ b/cppu/source/uno/EnvDcp.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,20 +29,20 @@ #include "uno/EnvDcp.h" -void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName) +void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName) { sal_Int32 colIdx = rtl_ustr_indexOfChar_WithLength(pEnvDcp->buffer, pEnvDcp->length, ':'); - if (colIdx >= 0) + if (colIdx >= 0) rtl_uString_newFromStr_WithLength(ppEnvTypeName, pEnvDcp->buffer, colIdx); else rtl_uString_newFromStr(ppEnvTypeName, pEnvDcp->buffer); } -void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose) +void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose) { sal_Int32 colIdx = rtl_ustr_indexOfChar_WithLength(pEnvDcp->buffer, pEnvDcp->length, ':'); - if (colIdx >= 0) + if (colIdx >= 0) rtl_uString_newFromStr_WithLength(ppEnvPurpose, pEnvDcp->buffer + colIdx, pEnvDcp->length - colIdx); else diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 330353a1e5c7..99322eb0dcf2 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ static void s_setCurrent(uno_Environment * pEnv) osl::MutexGuard guard(s_threadMap_mutex::get()); ThreadMap &rThreadMap = s_threadMap::get(); - if (pEnv) + if (pEnv) rThreadMap[threadId] = pEnv; else @@ -129,7 +129,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl { rtl::OUString envDcp(pTypeName); envDcp += currPurpose; - + uno_getEnvironment(ppEnv, envDcp.pData, NULL); } else @@ -150,10 +150,10 @@ static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const sal_Int32 nIndex1 = 0; sal_Int32 nIndex2 = 0; sal_Int32 sim = 0; - + rtl::OUString token1; rtl::OUString token2; - + do { token1 = str1.getToken(0, ':', nIndex1); @@ -222,7 +222,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un } return res; -} +} extern "C" { static void s_pull(va_list * pParam) { @@ -237,7 +237,7 @@ static void s_callInto_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_lis cppu::Enterable * pEnterable = reinterpret_cast<cppu::Enterable *>(pEnv->pReserved); if (pEnterable) pEnterable->callInto(s_pull, pCallee, pParam); - + else pCallee(pParam); } @@ -335,7 +335,7 @@ extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv) uno_Environment * pCurrEnv = s_getCurrent(); int res; - while ( (res = s_getNextEnv(&pNextEnv, pCurrEnv, pTargetEnv)) != 0) + while ( (res = s_getNextEnv(&pNextEnv, pCurrEnv, pTargetEnv)) != 0) { cppu::Enterable * pEnterable; @@ -347,7 +347,7 @@ extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv) pEnterable->leave(); pCurrEnv->release(pCurrEnv); break; - + case 1: pNextEnv->acquire(pNextEnv); pEnterable = reinterpret_cast<cppu::Enterable *>(pNextEnv->pReserved); diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx index 868a4d7c5e3c..3b82e2ba3a29 100644 --- a/cppu/source/uno/IdentityMapping.cxx +++ b/cppu/source/uno/IdentityMapping.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ using namespace ::com::sun::star; struct IdentityMapping : public uno_Mapping { - sal_Int32 m_nRef; + sal_Int32 m_nRef; uno::Environment m_env; IdentityMapping(uno::Environment const & rEnv); @@ -59,7 +59,7 @@ static void SAL_CALL s_acquire(uno_Mapping * pMapping) SAL_THROW(()) if (1 == ::osl_incrementInterlockedCount(&static_cast<IdentityMapping *>(pMapping)->m_nRef)) { uno_registerMapping( - &pMapping, + &pMapping, s_free, static_cast<IdentityMapping *>(pMapping)->m_env.get(), static_cast<IdentityMapping *>(pMapping)->m_env.get(), @@ -74,30 +74,30 @@ static void SAL_CALL s_release(uno_Mapping * pMapping) SAL_THROW(()) } static void SAL_CALL s_mapInterface(uno_Mapping * pMapping, - void ** ppOut, + void ** ppOut, void * pInterface, struct _typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/) SAL_THROW(()) { *ppOut = pInterface; - if (pInterface) + if (pInterface) { IdentityMapping * that = static_cast<IdentityMapping *>(pMapping); - + (that->m_env.get()->pExtEnv->acquireInterface)(that->m_env.get()->pExtEnv, pInterface); } } } -IdentityMapping::IdentityMapping(uno::Environment const & rEnv) +IdentityMapping::IdentityMapping(uno::Environment const & rEnv) : m_nRef(0), m_env(rEnv) { - uno_Mapping::acquire = s_acquire; - uno_Mapping::release = s_release; - uno_Mapping::mapInterface = s_mapInterface; + uno_Mapping::acquire = s_acquire; + uno_Mapping::release = s_release; + uno_Mapping::mapInterface = s_mapInterface; } diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx index cd9760640656..ccd1e4834a30 100644 --- a/cppu/source/uno/IdentityMapping.hxx +++ b/cppu/source/uno/IdentityMapping.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx index f83373ce4d5c..4dfd08e80f81 100644 --- a/cppu/source/uno/any.cxx +++ b/cppu/source/uno/any.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index 42375832ab09..c7aa7cb9cd12 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,7 +148,7 @@ inline sal_Bool _assignArray( { ::rtl_uString_assign( (rtl_uString **)pDest + i, ((rtl_uString **)pSource)[i] ); - } + } bRet = sal_True; break; case typelib_TypeClass_TYPE: @@ -165,7 +165,7 @@ inline sal_Bool _assignArray( for (i=0; i < nTotalElements; i++) { _destructAny( (uno_Any *)pDest + i, release ); - _copyConstructAny( (uno_Any *)pDest + i, (uno_Any *)pSource + i, + _copyConstructAny( (uno_Any *)pDest + i, (uno_Any *)pSource + i, pElementTypeRef, pElementTypeDescr, acquire, 0 ); } bRet = sal_True; @@ -183,7 +183,7 @@ inline sal_Bool _assignArray( { bRet = _assignStruct( (sal_Char *)pDest + i * nElementSize, (sal_Char *)pSource + i * nElementSize, - (typelib_CompoundTypeDescription *)pElementTypeDescr, + (typelib_CompoundTypeDescription *)pElementTypeDescr, queryInterface, acquire, release ); if (! bRet) break; @@ -194,8 +194,8 @@ inline sal_Bool _assignArray( for (i=0; i < nTotalElements; i++) { _destructUnion( (sal_Char*)pDest + i * nElementSize, pElementTypeDescr, release ); - _copyConstructUnion( (sal_Char*)pDest + i * nElementSize, - (sal_Char*)pSource + i * nElementSize, + _copyConstructUnion( (sal_Char*)pDest + i * nElementSize, + (sal_Char*)pSource + i * nElementSize, pElementTypeDescr, acquire, 0 ); } bRet = sal_True; @@ -216,8 +216,8 @@ inline sal_Bool _assignArray( for (i=0; i < nTotalElements; i++) { _assignInterface( - (void **)((sal_Char*)pDest + i * nElementSize), - *(void **)((sal_Char*)pSource + i * nElementSize), + (void **)((sal_Char*)pDest + i * nElementSize), + *(void **)((sal_Char*)pSource + i * nElementSize), acquire, release ); } bRet = sal_True; @@ -241,7 +241,7 @@ inline sal_Bool _assignData( { if (pDest == pSource) return _type_equals( pDestType, pSourceType ); - + if (! pSource) { _destructData( pDest, pDestType, pDestTypeDescr, release ); @@ -256,7 +256,7 @@ inline sal_Bool _assignData( if (pDest == pSource) return sal_True; } - + switch (pDestType->eTypeClass) { case typelib_TypeClass_VOID: @@ -614,7 +614,7 @@ inline sal_Bool _assignData( return true; } } - + // query for interface: void * pQueried = _queryInterface( *static_cast<void **>(pSource), pDestType, queryInterface ); diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 9e32c6db8bc5..560d5330e7ed 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ using namespace com::sun::star; class MediatorMapping : public uno_Mapping { oslInterlockedCount m_refCount; - + uno::Mapping m_from2uno; uno::Mapping m_uno2to; @@ -58,14 +58,14 @@ class MediatorMapping : public uno_Mapping uno::Environment m_interm; uno::Environment m_to; -public: +public: void acquire(void); void release(void); - void mapInterface(void ** ppOut, + void mapInterface(void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pInterfaceTypeDescr); - MediatorMapping(uno_Environment * pFrom, + MediatorMapping(uno_Environment * pFrom, uno_Environment * pInterm, uno_Environment * pTo); ~MediatorMapping(); @@ -77,16 +77,16 @@ static void SAL_CALL s_acquire(uno_Mapping * mapping) MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping); pMediatorMapping->acquire(); } - + static void SAL_CALL s_release(uno_Mapping * mapping) { MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping); pMediatorMapping->release(); } - + static void SAL_CALL s_mapInterface( uno_Mapping * mapping, - void ** ppOut, + void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pInterfaceTypeDescr) { @@ -95,7 +95,7 @@ static void SAL_CALL s_mapInterface( } } -MediatorMapping::MediatorMapping(uno_Environment * pFrom, +MediatorMapping::MediatorMapping(uno_Environment * pFrom, uno_Environment * pInterm, uno_Environment * pTo) : m_refCount(0), @@ -115,7 +115,7 @@ MediatorMapping::MediatorMapping(uno_Environment * pFrom, uno_Mapping::mapInterface = s_mapInterface; } -MediatorMapping::~MediatorMapping() +MediatorMapping::~MediatorMapping() { LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl); } @@ -148,7 +148,7 @@ extern "C" { static void s_mapInterface_v(va_list * pParam) }} void MediatorMapping::mapInterface( - void ** ppOut, + void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pInterfaceTypeDescr) { @@ -164,12 +164,12 @@ void MediatorMapping::mapInterface( uno_Interface * pUnoI = 0; m_from.invoke(s_mapInterface_v, &pUnoI, pInterface, pInterfaceTypeDescr, m_from2uno.get()); - + m_uno2to.mapInterface(&ret, pUnoI, pInterfaceTypeDescr); - + if (pUnoI) m_interm.get()->pExtEnv->releaseInterface(m_interm.get()->pExtEnv, pUnoI); - + *ppOut = ret; } @@ -186,10 +186,10 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & sal_Int32 nIndex1 = 0; sal_Int32 nIndex2 = 0; sal_Int32 sim = 0; - + rtl::OUString token1; rtl::OUString token2; - + do { token1 = str1.getToken(0, ':', nIndex1); @@ -208,21 +208,21 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & return result; } -// rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM("abc:def:ghi")); -// rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("abc:def")); -// rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("abc")); -// rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM("")); +// rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM("abc:def:ghi")); +// rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("abc:def")); +// rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("abc")); +// rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM("")); -// rtl::OUString pref; +// rtl::OUString pref; -// pref = getPrefix(str1, str1); -// pref = getPrefix(str1, str2); -// pref = getPrefix(str1, str3); -// pref = getPrefix(str1, str4); +// pref = getPrefix(str1, str1); +// pref = getPrefix(str1, str2); +// pref = getPrefix(str1, str3); +// pref = getPrefix(str1, str4); -// pref = getPrefix(str2, str1); -// pref = getPrefix(str3, str1); -// pref = getPrefix(str4, str1); +// pref = getPrefix(str2, str1); +// pref = getPrefix(str3, str1); +// pref = getPrefix(str4, str1); void getCascadeMapping(uno_Mapping ** ppMapping, @@ -266,7 +266,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, // direct mapping possible? // uno:bla-->uno:bla:blubb - if (from_envPurpose.equals(purpose)) + if (from_envPurpose.equals(purpose)) { rtl::OUString rest = to_envPurpose.copy(purpose.getLength()); @@ -292,7 +292,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, uno_envDcp += rest.copy(0, index); } - + uno_getEnvironment(&pInterm, uno_envDcp.pData, NULL); } else if (from_envType != uno_envType && to_envType == uno_envType) // <ANY> -> UNO ? @@ -311,7 +311,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, envDcp += to_envPurpose; uno_getEnvironment(&pInterm, envDcp.pData, NULL); } - else // everything else + else // everything else // mediate via uno:purpose { rtl::OUString purpose = getPrefix(from_envPurpose, to_envPurpose); @@ -329,7 +329,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, pMapping->acquire(pMapping); ::uno_registerMapping(&pMapping, s_MediatorMapping_free, pFrom, pTo, pAddPurpose); - + if (*ppMapping) (*ppMapping)->release(*ppMapping); diff --git a/cppu/source/uno/cascade_mapping.hxx b/cppu/source/uno/cascade_mapping.hxx index 9920fa05058d..db826705e2d7 100644 --- a/cppu/source/uno/cascade_mapping.hxx +++ b/cppu/source/uno/cascade_mapping.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx index b8eb9b5cc5ce..5a9f27d17a44 100644 --- a/cppu/source/uno/constr.hxx +++ b/cppu/source/uno/constr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,11 +64,11 @@ inline void _defaultConstructStruct( { defaultConstructStruct( pMem, pTypeDescr->pBaseTypeDescription ); } - + typelib_TypeDescriptionReference ** ppTypeRefs = (pTypeDescr)->ppTypeRefs; sal_Int32 * pMemberOffsets = pTypeDescr->pMemberOffsets; sal_Int32 nDescr = pTypeDescr->nMembers; - + while (nDescr--) { ::uno_type_constructData( (char *)pMem + pMemberOffsets[nDescr], ppTypeRefs[nDescr] ); @@ -107,8 +107,8 @@ inline void _defaultConstructArray( { rtl_uString** ppElement = (rtl_uString **)pMem + i; *ppElement = 0; - rtl_uString_new( ppElement); - } + rtl_uString_new( ppElement); + } break; case typelib_TypeClass_TYPE: for (i=0; i < nTotalElements; i++) @@ -145,7 +145,7 @@ inline void _defaultConstructArray( case typelib_TypeClass_SEQUENCE: for (i=0; i < nTotalElements; i++) { - uno_Sequence** ppElement = (uno_Sequence **)pMem + i; + uno_Sequence** ppElement = (uno_Sequence **)pMem + i; *ppElement = createEmptySequence(); } break; @@ -162,7 +162,7 @@ inline void _defaultConstructData( typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) -{ +{ switch (pType->eTypeClass) { case typelib_TypeClass_CHAR: diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index 7750a686b694..5b7791115aad 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,12 +77,12 @@ inline void _copyConstructStruct( // copy base value copyConstructStruct( pDest, pSource, pTypeDescr->pBaseTypeDescription, acquire, mapping ); } - + // then copy members typelib_TypeDescriptionReference ** ppTypeRefs = pTypeDescr->ppTypeRefs; sal_Int32 * pMemberOffsets = pTypeDescr->pMemberOffsets; sal_Int32 nDescr = pTypeDescr->nMembers; - + if (mapping) { while (nDescr--) @@ -179,7 +179,7 @@ inline void _copyConstructAnyFromData( { TYPE_ACQUIRE( pType ); pDestAny->pType = pType; - + switch (pType->eTypeClass) { case typelib_TypeClass_CHAR: @@ -648,7 +648,7 @@ inline uno_Sequence * icopyConstructSequence( pElements + (nPos * nElementSize); char * pSource2 = pSourceElements + (nPos * nElementSize); - + typelib_TypeDescriptionReference * pSetType = _unionGetSetType( pSource2, pElementTypeDescr ); ::uno_type_copyAndConvertData( @@ -671,7 +671,7 @@ inline uno_Sequence * icopyConstructSequence( typelib_TypeDescriptionReference * pSeqElementType = ((typelib_IndirectTypeDescription *) pElementTypeDescr)->pType; - + uno_Sequence ** pDestElements = (uno_Sequence **) pDest->elements; uno_Sequence ** pSourceElements = @@ -687,7 +687,7 @@ inline uno_Sequence * icopyConstructSequence( // because of reference counted sequence handles pDestElements[ nPos ] = pNew; } - + TYPELIB_DANGER_RELEASE( pElementTypeDescr ); } break; @@ -738,7 +738,7 @@ inline uno_Sequence * icopyConstructSequence( { pDest = allocSeq( 0, 0 ); } - + return pDest; } } diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 6d2982981d35..5a8de8a6cc50 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -361,7 +361,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( #if defined(INTEL) \ && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2) || \ - defined(OPENBSD)) || defined(MACOSX) \ + defined(OPENBSD)) || defined(MACOSX) \ || defined(__SUNPRO_CC) && defined(SOLARIS)) #define MAX_ALIGNMENT_4 #endif @@ -375,7 +375,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( #if OSL_DEBUG_LEVEL > 1 #if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OPENBSD)) && \ - (defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390)) + (defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390)) #define BINTEST_VERIFYSIZE( s, n ) \ fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \ if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } @@ -434,23 +434,23 @@ struct E struct M { - sal_Int32 n; - sal_Int16 o; + sal_Int32 n; + sal_Int16 o; }; struct N : public M { - sal_Int16 p CPPU_GCC3_ALIGN( M ); + sal_Int16 p CPPU_GCC3_ALIGN( M ); }; struct N2 { M m; - sal_Int16 p; + sal_Int16 p; }; struct O : public M { - double p; + double p; sal_Int16 q; }; struct O2 : public O @@ -460,7 +460,7 @@ struct O2 : public O struct P : public N { - double p2; + double p2; }; struct empty @@ -473,8 +473,8 @@ struct second : public empty struct AlignSize_Impl { - sal_Int16 nInt16; - double dDouble; + sal_Int16 nInt16; + double dDouble; }; struct Char1 @@ -608,9 +608,9 @@ BinaryCompatible_Impl::BinaryCompatible_Impl() } #ifdef SAL_W32 -# pragma pack(pop) +# pragma pack(pop) #elif defined(SAL_OS2) -# pragma pack() +# pragma pack() #endif static BinaryCompatible_Impl aTest; diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index 0dc28386afed..464dc932564d 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/uno/env_subst.cxx b/cppu/source/uno/env_subst.cxx index 6d75a35b662b..56cbb2004544 100644 --- a/cppu/source/uno/env_subst.cxx +++ b/cppu/source/uno/env_subst.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,8 +31,8 @@ #include "env_subst.hxx" -void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv, - rtl_uString * pEnvDcp, +void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv, + rtl_uString * pEnvDcp, void * pContext) SAL_THROW_EXTERN_C() { @@ -47,7 +47,7 @@ void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv, OSL_TRACE("UNO_ENV_SUBST \"%s\" -> \"%s\"", a_envDcp.getStr(), c_value); rtl::OUString value(c_value, rtl_str_getLength(c_value), RTL_TEXTENCODING_ASCII_US); - + envDcp = value; } diff --git a/cppu/source/uno/env_subst.hxx b/cppu/source/uno/env_subst.hxx index b0118a532403..50f3991889ee 100644 --- a/cppu/source/uno/env_subst.hxx +++ b/cppu/source/uno/env_subst.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include "uno/environment.h" -extern "C" void SAL_CALL uno_direct_getEnvironment(uno_Environment ** ppEnv, +extern "C" void SAL_CALL uno_direct_getEnvironment(uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext) SAL_THROW_EXTERN_C(); diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index 4b5a22c42da7..2f08feac5715 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ inline sal_Bool _equalObject( if ((0 == pI1) || (0 == pI2)) return sal_False; sal_Bool bRet = sal_False; - + typelib_TypeDescriptionReference * type_XInterface = * typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE ); if (0 == queryInterface) @@ -90,11 +90,11 @@ inline sal_Bool _equalStruct( { return sal_False; } - + typelib_TypeDescriptionReference ** ppTypeRefs = pTypeDescr->ppTypeRefs; sal_Int32 * pMemberOffsets = pTypeDescr->pMemberOffsets; sal_Int32 nDescr = pTypeDescr->nMembers; - + while (nDescr--) { sal_Int32 nOffset = pMemberOffsets[nDescr]; @@ -129,10 +129,10 @@ inline sal_Bool _equalSequence( return sal_False; if (! nElements) return sal_True; - + void * pDestElements = pDest->elements; void * pSourceElements = pSource->elements; - + switch (pElementType->eTypeClass) { case typelib_TypeClass_CHAR: @@ -320,7 +320,7 @@ inline sal_Bool _equalData( pSourceType = ((uno_Any *)pSource)->pType; pSource = ((uno_Any *)pSource)->pData; } - + switch (eDestTypeClass) { case typelib_TypeClass_VOID: diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 38e5ec746112..5599910817ab 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ struct ObjectEntry sal_Int32 nRef; ::std::vector< InterfaceEntry > aInterfaces; bool mixedObject; - + inline ObjectEntry( const OUString & rOId_ ); inline void append( @@ -163,11 +163,11 @@ struct uno_DefaultEnvironment : public uno_ExtEnvironment { sal_Int32 nRef; sal_Int32 nWeakRef; - + ::osl::Mutex mutex; Ptr2ObjectMap aPtr2ObjectMap; OId2ObjectMap aOId2ObjectMap; - + uno_DefaultEnvironment( const OUString & rEnvDcp_, void * pContext_ ); ~uno_DefaultEnvironment(); @@ -196,7 +196,7 @@ inline void ObjectEntry::append( aNewEntry.fpFreeProxy = fpFreeProxy; typelib_typedescription_acquire( (typelib_TypeDescription *) pTypeDescr ); aNewEntry.pTypeDescr = pTypeDescr; - + ::std::pair< Ptr2ObjectMap::iterator, bool > insertion( pEnv->aPtr2ObjectMap.insert( Ptr2ObjectMap::value_type( pInterface, this ) ) ); @@ -214,7 +214,7 @@ inline InterfaceEntry * ObjectEntry::find( OSL_ASSERT( ! aInterfaces.empty() ); if (aInterfaces.empty()) return 0; - + // shortcut common case: OUString const & type_name = OUString::unacquired( @@ -224,7 +224,7 @@ inline InterfaceEntry * ObjectEntry::find( { return &aInterfaces[ 0 ]; } - + ::std::size_t nSize = aInterfaces.size(); for ( ::std::size_t nPos = 0; nPos < nSize; ++nPos ) { @@ -263,11 +263,11 @@ static void SAL_CALL defenv_registerInterface( { OSL_ENSURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" ); OUString const & rOId = OUString::unacquired( &pOId ); - + uno_DefaultEnvironment * that = static_cast< uno_DefaultEnvironment * >( pEnv ); ::osl::ClearableMutexGuard guard( that->mutex ); - + // try to insert dummy 0: std::pair<OId2ObjectMap::iterator, bool> const insertion( that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) ); @@ -311,11 +311,11 @@ static void SAL_CALL defenv_registerProxyInterface( OSL_ENSURE( pEnv && ppInterface && pOId && pTypeDescr && freeProxy, "### null ptr!" ); OUString const & rOId = OUString::unacquired( &pOId ); - + uno_DefaultEnvironment * that = static_cast< uno_DefaultEnvironment * >( pEnv ); ::osl::ClearableMutexGuard guard( that->mutex ); - + // try to insert dummy 0: std::pair<OId2ObjectMap::iterator, bool> const insertion( that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) ); @@ -329,12 +329,12 @@ static void SAL_CALL defenv_registerProxyInterface( else // object entry exists { ObjectEntry * pOEntry = insertion.first->second; - + // first registration was an original, then registerProxyInterface(): pOEntry->mixedObject |= (!pOEntry->aInterfaces.empty() && pOEntry->aInterfaces[ 0 ].fpFreeProxy == 0); - + ++pOEntry->nRef; // another register call on object InterfaceEntry * pIEntry = pOEntry->find( pTypeDescr ); @@ -428,7 +428,7 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) typelib_TypeDescription * pTypeDescr = reinterpret_cast< typelib_TypeDescription * >( entry.pTypeDescr ); - + pOEntry->aInterfaces.erase( pOEntry->aInterfaces.begin() + index ); if (pOEntry->find( pInterface, index ) < 0) @@ -441,9 +441,9 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) that->aPtr2ObjectMap.erase( pInterface ); OSL_ASSERT( erased == 1 ); } - + guard.clear(); - + typelib_typedescription_release( pTypeDescr ); (*fpFreeProxy)( pEnv, pInterface ); } @@ -751,7 +751,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment( while (iPos != that->aOId2ObjectMap.end()) { ObjectEntry * pOEntry = iPos->second; - + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("+ ") ); if (pOEntry->mixedObject) buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("mixed ") ); @@ -766,7 +766,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment( nPos < pOEntry->aInterfaces.size(); ++nPos ) { const InterfaceEntry & rIEntry = pOEntry->aInterfaces[nPos]; - + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" - ") ); buf.append( ((typelib_TypeDescription *) rIEntry.pTypeDescr)->pTypeName ); @@ -784,7 +784,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment( buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("; ptr=0x") ); buf.append( reinterpret_cast< sal_IntPtr >(rIEntry.pInterface), 16 ); - + if (pOEntry->find( rIEntry.pInterface, nPos + 1 ) < 0) { ::std::size_t erased = ptr2obj.erase( rIEntry.pInterface ); @@ -1054,14 +1054,14 @@ inline void EnvironmentsData::getRegisteredEnvironments( } } -static bool loadEnv(OUString const & cLibStem, +static bool loadEnv(OUString const & cLibStem, uno_Environment * pEnv, void * /*pContext*/) { // late init with some code from matching uno language binding // will be unloaded by environment oslModule hMod = cppu::detail::loadModule( cLibStem ); - + if (!hMod) return false; @@ -1102,11 +1102,11 @@ static uno_Environment * initDefaultEnvironment( that->releaseInterface = unoenv_releaseInterface; OUString envPurpose = cppu::EnvDcp::getPurpose(rEnvDcp); - if (envPurpose.getLength()) + if (envPurpose.getLength()) { rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1); libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") ); - + if(!loadEnv(libStem, pEnv, pContext)) { pEnv->release(pEnv); @@ -1140,7 +1140,7 @@ void SAL_CALL uno_createEnvironment( OSL_ENSURE( ppEnv, "### null ptr!" ); if (*ppEnv) (*(*ppEnv)->release)( *ppEnv ); - + OUString const & rEnvDcp = OUString::unacquired( &pEnvDcp ); *ppEnv = initDefaultEnvironment( rEnvDcp, pContext ); } diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 243cfba6646e..12fbb25abc9f 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,10 +114,10 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW( () ) //================================================================================================== struct MappingEntry { - sal_Int32 nRef; - uno_Mapping * pMapping; - uno_freeMappingFunc freeMapping; - OUString aMappingName; + sal_Int32 nRef; + uno_Mapping * pMapping; + uno_freeMappingFunc freeMapping; + OUString aMappingName; MappingEntry( uno_Mapping * pMapping_, uno_freeMappingFunc freeMapping_, @@ -153,15 +153,15 @@ typedef set< OUString > t_OUStringSet; //================================================================================================== struct MappingsData { - Mutex aMappingsMutex; - t_OUString2Entry aName2Entry; - t_Mapping2Entry aMapping2Entry; + Mutex aMappingsMutex; + t_OUString2Entry aName2Entry; + t_Mapping2Entry aMapping2Entry; - Mutex aCallbacksMutex; - t_CallbackSet aCallbacks; + Mutex aCallbacksMutex; + t_CallbackSet aCallbacks; - Mutex aNegativeLibsMutex; - t_OUStringSet aNegativeLibs; + Mutex aNegativeLibsMutex; + t_OUStringSet aNegativeLibs; }; //-------------------------------------------------------------------------------------------------- static MappingsData & getMappingsData() SAL_THROW( () ) @@ -186,15 +186,15 @@ static MappingsData & getMappingsData() SAL_THROW( () ) */ struct uno_Mediate_Mapping : public uno_Mapping { - sal_Int32 nRef; + sal_Int32 nRef; Environment aFrom; Environment aTo; - Mapping aFrom2Uno; - Mapping aUno2To; + Mapping aFrom2Uno; + Mapping aUno2To; - OUString aAddPurpose; + OUString aAddPurpose; uno_Mediate_Mapping( const Environment & rFrom_, const Environment & rTo_, @@ -283,9 +283,9 @@ uno_Mediate_Mapping::uno_Mediate_Mapping( , aUno2To( rUno2To_ ) , aAddPurpose( rAddPurpose_ ) { - uno_Mapping::acquire = mediate_acquire; - uno_Mapping::release = mediate_release; - uno_Mapping::mapInterface = mediate_mapInterface; + uno_Mapping::acquire = mediate_acquire; + uno_Mapping::release = mediate_release; + uno_Mapping::mapInterface = mediate_mapInterface; } //================================================================================================== @@ -540,9 +540,9 @@ void SAL_CALL uno_getMapping( } // See if an identity mapping does fit. - if (!aRet.is() && pFrom == pTo && !aAddPurpose.getLength()) + if (!aRet.is() && pFrom == pTo && !aAddPurpose.getLength()) aRet = createIdentityMapping(pFrom); - + if (!aRet.is()) { getCascadeMapping(ppMapping, pFrom, pTo, pAddPurpose); diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx index fe2b9d0b1a59..718241555be6 100644 --- a/cppu/source/uno/loadmodule.cxx +++ b/cppu/source/uno/loadmodule.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx index fc3ec6dbbbe3..be36e829bf11 100644 --- a/cppu/source/uno/loadmodule.hxx +++ b/cppu/source/uno/loadmodule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx index 81f6f3148173..da51514b593b 100644 --- a/cppu/source/uno/prim.hxx +++ b/cppu/source/uno/prim.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 947e803cb76a..775ea01db1b7 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ static inline bool idefaultConstructElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(double), nAlloc ); if (pSeq != 0) - { + { double * pElements = (double *) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -180,7 +180,7 @@ static inline bool idefaultConstructElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(rtl_uString *), nAlloc ); if (pSeq != 0) - { + { rtl_uString ** pElements = (rtl_uString **) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -198,7 +198,7 @@ static inline bool idefaultConstructElements( pSeq, sizeof(typelib_TypeDescriptionReference *), nAlloc ); } if (pSeq != 0) - { + { typelib_TypeDescriptionReference ** pElements = (typelib_TypeDescriptionReference **) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) @@ -213,7 +213,7 @@ static inline bool idefaultConstructElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(uno_Any), nAlloc ); if (pSeq != 0) - { + { uno_Any * pElements = (uno_Any *) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -234,7 +234,7 @@ static inline bool idefaultConstructElements( ((typelib_EnumTypeDescription *) pElementTypeDescr)->nDefaultEnumValue; TYPELIB_DANGER_RELEASE( pElementTypeDescr ); - + sal_Int32 * pElements = (sal_Int32 *) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -245,11 +245,11 @@ static inline bool idefaultConstructElements( } case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: - { + { typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); sal_Int32 nElementSize = pElementTypeDescr->nSize; - + if (nAlloc >= 0) pSeq = reallocSeq( pSeq, nElementSize, nAlloc ); if (pSeq != 0) @@ -262,20 +262,20 @@ static inline bool idefaultConstructElements( (typelib_CompoundTypeDescription *)pElementTypeDescr ); } } - + TYPELIB_DANGER_RELEASE( pElementTypeDescr ); break; } case typelib_TypeClass_ARRAY: - { + { typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); sal_Int32 nElementSize = pElementTypeDescr->nSize; - + if (nAlloc >= 0) pSeq = reallocSeq( pSeq, nElementSize, nAlloc ); if (pSeq != 0) - { + { char * pElements = pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -284,7 +284,7 @@ static inline bool idefaultConstructElements( (typelib_ArrayTypeDescription *)pElementTypeDescr ); } } - + TYPELIB_DANGER_RELEASE( pElementTypeDescr ); break; } @@ -293,24 +293,24 @@ static inline bool idefaultConstructElements( typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); sal_Int32 nElementSize = pElementTypeDescr->nSize; - + if (nAlloc >= 0) pSeq = reallocSeq( pSeq, nElementSize, nAlloc ); if (pSeq != 0) - { + { sal_Int32 nValueOffset = ((typelib_UnionTypeDescription *) pElementTypeDescr)->nValueOffset; sal_Int64 nDefaultDiscr = ((typelib_UnionTypeDescription *) pElementTypeDescr)->nDefaultDiscriminant; - + typelib_TypeDescription * pDefaultTypeDescr = 0; TYPELIB_DANGER_GET( &pDefaultTypeDescr, ((typelib_UnionTypeDescription *) pElementTypeDescr)->pDefaultTypeRef ); - + char * pElements = pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -321,7 +321,7 @@ static inline bool idefaultConstructElements( } TYPELIB_DANGER_RELEASE( pDefaultTypeDescr ); } - + TYPELIB_DANGER_RELEASE( pElementTypeDescr ); break; } @@ -330,7 +330,7 @@ static inline bool idefaultConstructElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(uno_Sequence *), nAlloc ); if (pSeq != 0) - { + { uno_Sequence ** pElements = (uno_Sequence **) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) @@ -344,7 +344,7 @@ static inline bool idefaultConstructElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(void *), nAlloc ); if (pSeq != 0) - { + { ::rtl_zeroMemory( pSeq->elements + (sizeof(void *) * nStartIndex), sizeof(void *) * (nStopIndex - nStartIndex) ); @@ -355,7 +355,7 @@ static inline bool idefaultConstructElements( pSeq = 0; break; } - + if (pSeq == 0) { OSL_ASSERT( nAlloc >= 0 ); // must have been an allocation failure @@ -383,7 +383,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(sal_Unicode), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(sal_Unicode) * nStartIndex), (char *)pSourceElements + (sizeof(sal_Unicode) * nStartIndex), @@ -394,7 +394,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(sal_Bool), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(sal_Bool) * nStartIndex), (char *)pSourceElements + (sizeof(sal_Bool) * nStartIndex), @@ -405,7 +405,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(sal_Int8), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(sal_Int8) * nStartIndex), (char *)pSourceElements + (sizeof(sal_Int8) * nStartIndex), @@ -417,7 +417,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(sal_Int16), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(sal_Int16) * nStartIndex), (char *)pSourceElements + (sizeof(sal_Int16) * nStartIndex), @@ -429,7 +429,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(sal_Int32), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(sal_Int32) * nStartIndex), (char *)pSourceElements + (sizeof(sal_Int32) * nStartIndex), @@ -441,7 +441,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(sal_Int64), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(sal_Int64) * nStartIndex), (char *)pSourceElements + (sizeof(sal_Int64) * nStartIndex), @@ -452,7 +452,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(float), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(float) * nStartIndex), (char *)pSourceElements + (sizeof(float) * nStartIndex), @@ -463,7 +463,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(double), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(double) * nStartIndex), (char *)pSourceElements + (sizeof(double) * nStartIndex), @@ -474,7 +474,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(sal_Int32), nAlloc ); if (pSeq != 0) - { + { ::rtl_copyMemory( pSeq->elements + (sizeof(sal_Int32) * nStartIndex), (char *)pSourceElements + (sizeof(sal_Int32) * nStartIndex), @@ -486,7 +486,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(rtl_uString *), nAlloc ); if (pSeq != 0) - { + { rtl_uString ** pDestElements = (rtl_uString **) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -525,7 +525,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(uno_Any), nAlloc ); if (pSeq != 0) - { + { uno_Any * pDestElements = (uno_Any *) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -545,13 +545,13 @@ static inline bool icopyConstructFromElements( typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); sal_Int32 nElementSize = pElementTypeDescr->nSize; - + if (nAlloc >= 0) pSeq = reallocSeq( pSeq, nElementSize, nAlloc ); if (pSeq != 0) - { + { char * pDestElements = pSeq->elements; - + typelib_CompoundTypeDescription * pTypeDescr = (typelib_CompoundTypeDescription *)pElementTypeDescr; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) @@ -560,7 +560,7 @@ static inline bool icopyConstructFromElements( pDestElements + (nElementSize * nPos); char * pSource = (char *)pSourceElements + (nElementSize * nPos); - + if (pTypeDescr->pBaseTypeDescription) { // copy base value @@ -568,13 +568,13 @@ static inline bool icopyConstructFromElements( pDest, pSource, pTypeDescr->pBaseTypeDescription, acquire, 0 ); } - + // then copy members typelib_TypeDescriptionReference ** ppTypeRefs = pTypeDescr->ppTypeRefs; sal_Int32 * pMemberOffsets = pTypeDescr->pMemberOffsets; sal_Int32 nDescr = pTypeDescr->nMembers; - + while (nDescr--) { ::uno_type_copyData( @@ -584,7 +584,7 @@ static inline bool icopyConstructFromElements( } } } - + TYPELIB_DANGER_RELEASE( pElementTypeDescr ); break; } @@ -599,7 +599,7 @@ static inline bool icopyConstructFromElements( if (pSeq != 0) { char * pDestElements = pSeq->elements; - + sal_Int32 nValueOffset = ((typelib_UnionTypeDescription *) pElementTypeDescr)->nValueOffset; @@ -609,7 +609,7 @@ static inline bool icopyConstructFromElements( pDestElements + (nElementSize * nPos); char * pSource = (char *)pSourceElements + (nElementSize * nPos); - + typelib_TypeDescriptionReference * pSetType = _unionGetSetType( pSource, pElementTypeDescr ); ::uno_type_copyData( @@ -620,7 +620,7 @@ static inline bool icopyConstructFromElements( typelib_typedescriptionreference_release( pSetType ); } } - + TYPELIB_DANGER_RELEASE( pElementTypeDescr ); break; } @@ -654,7 +654,7 @@ static inline bool icopyConstructFromElements( if (nAlloc >= 0) pSeq = reallocSeq( pSeq, sizeof(void *), nAlloc ); if (pSeq != 0) - { + { void ** pDestElements = (void **) pSeq->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { @@ -669,7 +669,7 @@ static inline bool icopyConstructFromElements( pSeq = 0; break; } - + if (pSeq == 0) { OSL_ASSERT( nAlloc >= 0 ); // must have been an allocation failure @@ -690,9 +690,9 @@ static inline bool ireallocSequence( uno_AcquireFunc acquire, uno_ReleaseFunc release ) { bool ret = true; - uno_Sequence * pSeq = *ppSequence; + uno_Sequence * pSeq = *ppSequence; sal_Int32 nElements = pSeq->nElements; - + if (pSeq->nRefCount > 1 || // not mem-copyable elements? typelib_TypeClass_ANY == pElementType->eTypeClass || @@ -701,10 +701,10 @@ static inline bool ireallocSequence( { // split sequence and construct new one from scratch uno_Sequence * pNew = 0; - + sal_Int32 nRest = nSize - nElements; sal_Int32 nCopy = (nRest > 0 ? nElements : nSize); - + if (nCopy >= 0) { ret = icopyConstructFromElements( @@ -719,7 +719,7 @@ static inline bool ireallocSequence( nCopy, nSize, nCopy >= 0 ? -1 /* no mem allocation */ : nSize ); } - + if (ret) { // destruct sequence @@ -758,7 +758,7 @@ static inline bool ireallocSequence( ret = (*ppSequence != 0); } } - + return ret; } @@ -779,10 +779,10 @@ sal_Bool SAL_CALL uno_type_sequence_construct( { typelib_TypeDescription * pTypeDescr = 0; TYPELIB_DANGER_GET( &pTypeDescr, pType ); - + typelib_TypeDescriptionReference * pElementType = ((typelib_IndirectTypeDescription *)pTypeDescr)->pType; - + *ppSequence = 0; if (pElements == 0) { @@ -798,7 +798,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct( 0, len, acquire, len ); // alloc to len } - + TYPELIB_DANGER_RELEASE( pTypeDescr ); } else @@ -806,7 +806,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct( *ppSequence = createEmptySequence(); ret = true; } - + OSL_ASSERT( (*ppSequence != 0) == ret ); return ret; } @@ -823,7 +823,7 @@ sal_Bool SAL_CALL uno_sequence_construct( { typelib_TypeDescriptionReference * pElementType = ((typelib_IndirectTypeDescription *)pTypeDescr)->pType; - + *ppSequence = 0; if (pElements == 0) { @@ -845,7 +845,7 @@ sal_Bool SAL_CALL uno_sequence_construct( *ppSequence = createEmptySequence(); ret = true; } - + OSL_ASSERT( (*ppSequence != 0) == ret ); return ret; } @@ -880,7 +880,7 @@ sal_Bool SAL_CALL uno_sequence_realloc( { OSL_ENSURE( ppSequence, "### null ptr!" ); OSL_ENSURE( nSize >= 0, "### new size must be at least 0!" ); - + bool ret = true; if (nSize != (*ppSequence)->nElements) { @@ -908,7 +908,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One( { typelib_TypeDescription * pTypeDescr = 0; TYPELIB_DANGER_GET( &pTypeDescr, pType ); - + ret = icopyConstructFromElements( &pNew, pSequence->elements, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, @@ -919,7 +919,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One( idestructSequence( *ppSequence, pType, pTypeDescr, release ); *ppSequence = pNew; } - + TYPELIB_DANGER_RELEASE( pTypeDescr ); } else @@ -977,7 +977,7 @@ sal_Bool SAL_CALL uno_sequence_reference2One( *ppSequence = pNew; } } - + } return ret; } diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map index e89594615f53..451b4b689678 100755 --- a/cppu/util/cppu.map +++ b/cppu/util/cppu.map @@ -48,7 +48,7 @@ UDK_3_0_0 { uno_assignData; uno_type_assignData; uno_type_isAssignableFromData; - + uno_any_assign; uno_type_any_assign; uno_any_construct; @@ -92,7 +92,7 @@ UDK_3_0_0 { uno_threadpool_dispose; uno_threadpool_attach; uno_threadpool_detach; - + cppu_unsatisfied_iquery_msg; local: *; |