From 8792ec7b2129650777b7b4bfacaa7c13d923279b Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Tue, 25 Feb 2014 19:06:16 +0100 Subject: Remove visual noise from include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/com/sun/star/uno/Any.hxx | 94 +++++++++++++++++----------------- include/com/sun/star/uno/Reference.hxx | 86 +++++++++++++++---------------- include/com/sun/star/uno/Type.hxx | 20 ++++---- include/com/sun/star/uno/genfunc.hxx | 6 +-- 4 files changed, 103 insertions(+), 103 deletions(-) (limited to 'include/com/sun/star/uno') diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx index 8046c0d2cae8..f021894926dd 100644 --- a/include/com/sun/star/uno/Any.hxx +++ b/include/com/sun/star/uno/Any.hxx @@ -42,13 +42,13 @@ namespace star namespace uno { -//__________________________________________________________________________________________________ + inline Any::Any() SAL_THROW(()) { ::uno_any_construct( this, 0, 0, (uno_AcquireFunc)cpp_acquire ); } -//______________________________________________________________________________ + template inline Any::Any( T const & value ) { @@ -57,7 +57,7 @@ inline Any::Any( T const & value ) ::cppu::getTypeFavourUnsigned(&value).getTypeLibType(), (uno_AcquireFunc) cpp_acquire ); } -//______________________________________________________________________________ + inline Any::Any( bool value ) { sal_Bool b = value; @@ -66,37 +66,37 @@ inline Any::Any( bool value ) (uno_AcquireFunc) cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::Any( const Any & rAny ) SAL_THROW(()) { ::uno_type_any_construct( this, rAny.pData, rAny.pType, (uno_AcquireFunc)cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::Any( const void * pData_, const Type & rType ) SAL_THROW(()) { ::uno_type_any_construct( this, const_cast< void * >( pData_ ), rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { ::uno_any_construct( this, const_cast< void * >( pData_ ), pTypeDescr, (uno_AcquireFunc)cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::Any( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW(()) { ::uno_type_any_construct( this, const_cast< void * >( pData_ ), pType_, (uno_AcquireFunc)cpp_acquire ); } -//__________________________________________________________________________________________________ + inline Any::~Any() SAL_THROW(()) { ::uno_any_destruct( this, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline Any & Any::operator = ( const Any & rAny ) SAL_THROW(()) { if (this != &rAny) @@ -107,39 +107,39 @@ inline Any & Any::operator = ( const Any & rAny ) SAL_THROW(()) } return *this; } -//__________________________________________________________________________________________________ + inline ::rtl::OUString Any::getValueTypeName() const SAL_THROW(()) { return ::rtl::OUString( pType->pTypeName ); } -//__________________________________________________________________________________________________ + inline void Any::setValue( const void * pData_, const Type & rType ) SAL_THROW(()) { ::uno_type_any_assign( this, const_cast< void * >( pData_ ), rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline void Any::setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW(()) { ::uno_type_any_assign( this, const_cast< void * >( pData_ ), pType_, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline void Any::setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(()) { ::uno_any_assign( this, const_cast< void * >( pData_ ), pTypeDescr, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline void Any::clear() SAL_THROW(()) { ::uno_any_clear( this, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline bool Any::isExtractableTo( const Type & rType ) const SAL_THROW(()) { return ::uno_type_isAssignableFromData( @@ -147,7 +147,7 @@ inline bool Any::isExtractableTo( const Type & rType ) const SAL_THROW(()) (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release ); } -//______________________________________________________________________________ + template inline bool Any::has() const { @@ -162,14 +162,14 @@ inline bool Any::has() const template <> bool Any::has() const; -//__________________________________________________________________________________________________ + inline bool Any::operator == ( const Any & rAny ) const SAL_THROW(()) { return ::uno_type_equalData( pData, pType, rAny.pData, rAny.pType, (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release ); } -//__________________________________________________________________________________________________ + inline bool Any::operator != ( const Any & rAny ) const SAL_THROW(()) { return (! ::uno_type_equalData( @@ -177,7 +177,7 @@ inline bool Any::operator != ( const Any & rAny ) const SAL_THROW(()) (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release )); } -//__________________________________________________________________________________________________ + template< class C > inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(()) { @@ -185,7 +185,7 @@ inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(()) } // additionally specialized for C++ bool -//______________________________________________________________________________ + template<> inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(()) { @@ -193,7 +193,7 @@ inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(()) return Any( &b, ::getCppuBooleanType() ); } -//__________________________________________________________________________________________________ + #ifdef RTL_FAST_STRING template< class C1, class C2 > inline Any SAL_CALL makeAny( const rtl::OUStringConcat< C1, C2 >& value ) SAL_THROW(()) @@ -202,7 +202,7 @@ inline Any SAL_CALL makeAny( const rtl::OUStringConcat< C1, C2 >& value ) SAL_TH return Any( &str, ::cppu::getTypeFavourUnsigned(&str) ); } #endif -//__________________________________________________________________________________________________ + template< class C > inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(()) { @@ -213,7 +213,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(()) } // additionally for C++ bool: -//______________________________________________________________________________ + template<> inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) SAL_THROW(()) @@ -224,7 +224,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) (uno_AcquireFunc) cpp_acquire, (uno_ReleaseFunc) cpp_release ); } -//______________________________________________________________________________ + #ifdef RTL_FAST_STRING template< class C1, class C2 > inline void SAL_CALL operator <<= ( Any & rAny, const rtl::OUStringConcat< C1, C2 >& value ) @@ -237,7 +237,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const rtl::OUStringConcat< C1, C (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); } #endif -//__________________________________________________________________________________________________ + template< class C > inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(()) { @@ -250,7 +250,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(()) } // bool -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW(()) { @@ -261,7 +261,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal } return false; } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(()) { @@ -269,7 +269,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SA (value != sal_False) == (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False)); } -//______________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) SAL_THROW(()) @@ -283,7 +283,7 @@ inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) return false; } -//______________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( Any const & rAny, bool const & value ) SAL_THROW(()) @@ -295,7 +295,7 @@ inline bool SAL_CALL operator == ( Any const & rAny, bool const & value ) } // byte -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW(()) { @@ -307,7 +307,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal return false; } // short -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(()) { @@ -324,7 +324,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_TH return false; } } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(()) { @@ -342,7 +342,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_T } } // long -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(()) { @@ -365,7 +365,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_TH return false; } } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(()) { @@ -389,7 +389,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_T } } // hyper -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(()) { @@ -418,7 +418,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_TH return false; } } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(()) { @@ -448,7 +448,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_T } } // float -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(()) { @@ -471,7 +471,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW( } } // double -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(()) { @@ -503,7 +503,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW } } // string -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(()) { @@ -514,7 +514,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) } return false; } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(()) { @@ -522,7 +522,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & val value.equals( * reinterpret_cast< const ::rtl::OUString * >( rAny.pData ) )); } // type -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(()) { @@ -533,7 +533,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(( } return false; } -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(()) { @@ -541,7 +541,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_TH value.equals( * reinterpret_cast< const Type * >( rAny.pData ) )); } // any -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(()) { @@ -554,7 +554,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(() return true; } // interface -//__________________________________________________________________________________________________ + template<> inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(()) { @@ -566,7 +566,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value } // operator to compare to an any. -//__________________________________________________________________________________________________ + template< class C > inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(()) { @@ -577,7 +577,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release ); } // operator to compare to an any. may use specialized operators ==. -//__________________________________________________________________________________________________ + template< class C > inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(()) { @@ -588,7 +588,7 @@ extern "C" rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg( uno_Any const * pAny, typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C(); -//______________________________________________________________________________ + template T Any::get() const { diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx index 1e6a13bfa66b..c26550273abc 100644 --- a/include/com/sun/star/uno/Reference.hxx +++ b/include/com/sun/star/uno/Reference.hxx @@ -33,7 +33,7 @@ namespace star namespace uno { -//__________________________________________________________________________________________________ + inline XInterface * BaseReference::iquery( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ) @@ -50,7 +50,7 @@ inline XInterface * BaseReference::iquery( } return 0; } -//__________________________________________________________________________________________________ + template< class interface_type > inline XInterface * Reference< interface_type >::iquery( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) @@ -63,7 +63,7 @@ extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C(); -//__________________________________________________________________________________________________ + inline XInterface * BaseReference::iquery_throw( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ) @@ -75,7 +75,7 @@ inline XInterface * BaseReference::iquery_throw( ::rtl::OUString( cppu_unsatisfied_iquery_msg( rType.getTypeLibType() ), SAL_NO_ACQUIRE ), Reference< XInterface >( pInterface ) ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline XInterface * Reference< interface_type >::iquery_throw( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) @@ -83,7 +83,7 @@ inline XInterface * Reference< interface_type >::iquery_throw( return BaseReference::iquery_throw( pInterface, interface_type::static_type()); } -//__________________________________________________________________________________________________ + template< class interface_type > inline interface_type * Reference< interface_type >::iset_throw( interface_type * pInterface ) SAL_THROW( (RuntimeException) ) @@ -98,20 +98,20 @@ inline interface_type * Reference< interface_type >::iset_throw( NULL ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::~Reference() SAL_THROW(()) { if (_pInterface) _pInterface->release(); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference() SAL_THROW(()) { _pInterface = 0; } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef ) SAL_THROW(()) { @@ -119,7 +119,7 @@ inline Reference< interface_type >::Reference( const Reference< interface_type > if (_pInterface) _pInterface->acquire(); } -//__________________________________________________________________________________________________ + template< class interface_type > template< class derived_type > inline Reference< interface_type >::Reference( const Reference< derived_type > & rRef, @@ -131,7 +131,7 @@ inline Reference< interface_type >::Reference( if (_pInterface) _pInterface->acquire(); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL_THROW(()) { @@ -139,70 +139,70 @@ inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL if (_pInterface) _pInterface->acquire(); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()) { _pInterface = castToXInterface(pInterface); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()) { _pInterface = castToXInterface(pInterface); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery( rRef.get() ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery( pInterface ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { _pInterface = (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass ? iquery( static_cast< XInterface * >( rAny.pReserved ) ) : 0); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery_throw( rRef.get() ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery_throw( pInterface ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = iquery_throw( typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass ? static_cast< XInterface * >( rAny.pReserved ) : 0 ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = castToXInterface( iset_throw( rRef.get() ) ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { _pInterface = castToXInterface( iset_throw( pInterface ) ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::clear() SAL_THROW(()) { @@ -213,7 +213,7 @@ inline void Reference< interface_type >::clear() SAL_THROW(()) pOld->release(); } } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( interface_type * pInterface ) SAL_THROW(()) @@ -226,7 +226,7 @@ inline bool Reference< interface_type >::set( pOld->release(); return (0 != pInterface); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()) @@ -237,7 +237,7 @@ inline bool Reference< interface_type >::set( pOld->release(); return (0 != pInterface); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()) @@ -245,21 +245,21 @@ inline bool Reference< interface_type >::set( return set( pInterface, SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( const Reference< interface_type > & rRef ) SAL_THROW(()) { return set( castFromXInterface( rRef._pInterface ) ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { return set( castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ) @@ -267,7 +267,7 @@ inline bool Reference< interface_type >::set( return set( castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE ); } -//______________________________________________________________________________ + template< class interface_type > inline bool Reference< interface_type >::set( Any const & rAny, UnoReference_Query ) @@ -280,14 +280,14 @@ inline bool Reference< interface_type >::set( SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { set( castFromXInterface(iquery_throw( pInterface )), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) @@ -295,7 +295,7 @@ inline void Reference< interface_type >::set( set( castFromXInterface(iquery_throw( rRef.get() )), SAL_NO_ACQUIRE ); } -//______________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( Any const & rAny, UnoReference_QueryThrow ) @@ -306,14 +306,14 @@ inline void Reference< interface_type >::set( ? static_cast< XInterface * >( rAny.pReserved ) : 0 )), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { set( iset_throw( pInterface ), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline void Reference< interface_type >::set( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) @@ -321,7 +321,7 @@ inline void Reference< interface_type >::set( set( rRef.get(), UNO_SET_THROW ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type > & Reference< interface_type >::operator = ( interface_type * pInterface ) SAL_THROW(()) @@ -329,7 +329,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = ( set( pInterface ); return *this; } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type > & Reference< interface_type >::operator = ( const Reference< interface_type > & rRef ) SAL_THROW(()) @@ -338,7 +338,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = ( return *this; } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type > Reference< interface_type >::query( const BaseReference & rRef ) SAL_THROW( (RuntimeException) ) @@ -346,7 +346,7 @@ inline Reference< interface_type > Reference< interface_type >::query( return Reference< interface_type >( castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE ); } -//__________________________________________________________________________________________________ + template< class interface_type > inline Reference< interface_type > Reference< interface_type >::query( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) @@ -355,9 +355,9 @@ inline Reference< interface_type > Reference< interface_type >::query( castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE ); } -//################################################################################################## -//__________________________________________________________________________________________________ + + inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THROW(()) { if (_pInterface == pInterface) @@ -375,7 +375,7 @@ inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THR } } -//______________________________________________________________________________ + inline bool BaseReference::operator < ( const BaseReference & rRef ) const SAL_THROW(()) { @@ -394,17 +394,17 @@ inline bool BaseReference::operator < ( } } -//__________________________________________________________________________________________________ + inline bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW(()) { return (! operator == ( pInterface )); } -//__________________________________________________________________________________________________ + inline bool BaseReference::operator == ( const BaseReference & rRef ) const SAL_THROW(()) { return operator == ( rRef._pInterface ); } -//__________________________________________________________________________________________________ + inline bool BaseReference::operator != ( const BaseReference & rRef ) const SAL_THROW(()) { return (! operator == ( rRef._pInterface )); diff --git a/include/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx index e32a64594bdc..c6456f554f21 100644 --- a/include/com/sun/star/uno/Type.hxx +++ b/include/com/sun/star/uno/Type.hxx @@ -32,60 +32,60 @@ namespace star namespace uno { -//__________________________________________________________________________________________________ + inline Type::Type() SAL_THROW(()) { _pType = reinterpret_cast< const ::com::sun::star::uno::Type * >( ::typelib_static_type_getByTypeClass( typelib_TypeClass_VOID ) )->getTypeLibType(); ::typelib_typedescriptionreference_acquire( _pType ); } -//__________________________________________________________________________________________________ + inline Type::Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW(()) : _pType( 0 ) { ::typelib_typedescriptionreference_new( &_pType, (typelib_TypeClass)eTypeClass, rTypeName.pData ); } -//__________________________________________________________________________________________________ + inline Type::Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW(()) : _pType( 0 ) { ::typelib_typedescriptionreference_newByAsciiName( &_pType, (typelib_TypeClass)eTypeClass, pTypeName ); } -//__________________________________________________________________________________________________ + inline Type::Type( typelib_TypeDescriptionReference * pType ) SAL_THROW(()) : _pType( pType ) { ::typelib_typedescriptionreference_acquire( _pType ); } -//__________________________________________________________________________________________________ + inline Type::Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW(()) : _pType( pType ) { } -//__________________________________________________________________________________________________ + inline Type::Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW(()) : _pType( pType ) { } -//__________________________________________________________________________________________________ + inline Type::Type( const Type & rType ) SAL_THROW(()) : _pType( rType._pType ) { ::typelib_typedescriptionreference_acquire( _pType ); } -//__________________________________________________________________________________________________ + inline ::rtl::OUString Type::getTypeName() const SAL_THROW(()) { return ::rtl::OUString( _pType->pTypeName ); } -//__________________________________________________________________________________________________ + inline Type & Type::operator = ( const Type & rType ) SAL_THROW(()) { ::typelib_typedescriptionreference_assign( &_pType, rType._pType ); return *this; } -//__________________________________________________________________________________________________ + template< class T > typelib_TypeDescriptionReference * Array< T >::s_pType = 0; diff --git a/include/com/sun/star/uno/genfunc.hxx b/include/com/sun/star/uno/genfunc.hxx index 1465af0a1ea9..3c230756a6e2 100644 --- a/include/com/sun/star/uno/genfunc.hxx +++ b/include/com/sun/star/uno/genfunc.hxx @@ -32,19 +32,19 @@ namespace star namespace uno { -//================================================================================================== + inline void SAL_CALL cpp_acquire( void * pCppI ) SAL_THROW(()) { reinterpret_cast< XInterface * >( pCppI )->acquire(); } -//================================================================================================== + inline void SAL_CALL cpp_release( void * pCppI ) SAL_THROW(()) { reinterpret_cast< XInterface * >( pCppI )->release(); } -//================================================================================================== + inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescriptionReference * pType ) SAL_THROW(()) { -- cgit