diff options
Diffstat (limited to 'cppuhelper/inc')
56 files changed, 644 insertions, 644 deletions
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx index 7b177c9e8ea4..acd5008b83de 100644 --- a/cppuhelper/inc/cppuhelper/access_control.hxx +++ b/cppuhelper/inc/cppuhelper/access_control.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,10 +40,10 @@ namespace cppu class AccessControl { ::com::sun::star::uno::Reference< ::com::sun::star::security::XAccessController > m_xController; - + public: /** Ctor. - + @param xContext component context to retrieve access controller singleton */ AccessControl( @@ -51,7 +51,7 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); /** Ctor. - + @param xController access controller */ AccessControl( @@ -59,33 +59,33 @@ public: ::com::sun::star::security::XAccessController > const & xController ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); /** Copy ctor. - + @param another object */ AccessControl( ::cppu::AccessControl const & ac ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); - + /** Clears the access controller reference being used. */ inline void SAL_CALL clear() SAL_THROW( () ) { m_xController.clear(); } - + /** Returns access to the access controller reference being used. - + @return access controller */ inline ::com::sun::star::uno::Reference< ::com::sun::star::security::XAccessController > const & SAL_CALL get() const SAL_THROW( () ) { return m_xController; } - + /** Returns access to the access controller reference being used. - + @return access controller */ inline ::com::sun::star::security::XAccessController * SAL_CALL operator -> () const SAL_THROW( () ) { return m_xController.get(); } - - + + /** A com.sun.star.security.RuntimePermission is for runtime permissions. A RuntimePermission contains a name (also referred to as a "target name") but no actions list; you either have the named permission or you don't. @@ -95,7 +95,7 @@ public: void SAL_CALL checkRuntimePermission( ::rtl::OUString const & name ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); - + /** A com.sun.star.io.FilePermission represents access to a file or directory. A FilePermission consists of a file url and a set of actions valid for that pathname. @@ -106,7 +106,7 @@ public: ::rtl::OUString const & url, ::rtl::OUString const & actions ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); - + /** A com.sun.star.connection.SocketPermission represents access to a network via sockets. A SocketPermission consists of a host specification and a set of "actions" specifying ways to connect to that host. diff --git a/cppuhelper/inc/cppuhelper/basemutex.hxx b/cppuhelper/inc/cppuhelper/basemutex.hxx index f145709095fb..0b94deda0174 100644 --- a/cppuhelper/inc/cppuhelper/basemutex.hxx +++ b/cppuhelper/inc/cppuhelper/basemutex.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,7 +35,7 @@ namespace cppu { /** base class for all classes who want derive from ::cppu::WeakComponentImplHelperXX. - + Implmentation classes have first to derive from BaseMutex and then from ::cppu::WeakComponentImplHelperXX to ensure that the BaseMutex is completely initialized when the mutex is used to intialize the diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx index 253d3fa53b40..76a0c32a4905 100644 --- a/cppuhelper/inc/cppuhelper/bootstrap.hxx +++ b/cppuhelper/inc/cppuhelper/bootstrap.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 @@ -44,7 +44,7 @@ namespace cppu { /** Creates a simple registry service instance. - + @rBootstrapPath optional bootstrap path for initial components @return simple registry service instance */ @@ -54,7 +54,7 @@ SAL_CALL createSimpleRegistry( SAL_THROW( () ); /** Creates a nested registry service instance. - + @rBootstrapPath optional bootstrap path for initial components @return nested registry service instance */ @@ -64,7 +64,7 @@ SAL_CALL createNestedRegistry( SAL_THROW( () ); /** Installs type description manager instance, i.e. registers a callback at cppu core. - + @param xTDMgr manager instance @return true, if successfully registered */ @@ -78,7 +78,7 @@ sal_Bool SAL_CALL installTypeDescriptionManager( - simple registry, nested registry, - implementation registration - registry typedescription provider, typedescription manager (also installs it into cppu core) - + @param xRegistry registry for service manager and singleton objects of context (may be null) @param rBootstrapPath optional bootstrap path for initial components @return component context @@ -97,16 +97,16 @@ bootstrap_InitialComponentContext( - simple registry, nested registry, - implementation registration - registry typedescription provider, typedescription manager (also installs it into cppu core) - + This function tries to find its parameters via these bootstrap variables: - + - UNO_TYPES -- a space separated list of file urls of type rdbs - UNO_SERVICES -- a space separated list of file urls of service rdbs - UNO_WRITERDB -- a file url of a write rdb (e.g. user.rdb) - + Please look at http://udk.openoffice.org/common/man/concept/uno_default_bootstrapping.html for further info. - + @return component context */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL @@ -120,13 +120,13 @@ defaultBootstrap_InitialComponentContext() SAL_THROW( (::com::sun::star::uno::Ex - simple registry, nested registry, - implementation registration - registry typedescription provider, typedescription manager (also installs it into cppu core) - + This function tries to find its parameters via these bootstrap variables: - + - UNO_TYPES -- a space separated list of file urls of type rdbs - UNO_SERVICES -- a space separated list of file urls of service rdbs - UNO_WRITERDB -- a file url of a write rdb (e.g. user.rdb) - + Please look at http://udk.openoffice.org/common/man/concept/uno_default_bootstrapping.html for further info. @@ -136,7 +136,7 @@ defaultBootstrap_InitialComponentContext() SAL_THROW( (::com::sun::star::uno::Ex ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL defaultBootstrap_InitialComponentContext(const ::rtl::OUString & iniFile) SAL_THROW( (::com::sun::star::uno::Exception) ); -/** +/** * An exception indicating a bootstrap error. * * @since UDK 3.2.0 @@ -145,11 +145,11 @@ class BootstrapException { public: /** - * Constructs a BootstrapException. + * Constructs a BootstrapException. */ BootstrapException(); - /** + /** * Constructs a BootstrapException with the specified detail message. * * @param rMessage @@ -179,14 +179,14 @@ public: this BootstrapException. */ const ::rtl::OUString & getMessage() const; - + private: ::rtl::OUString m_aMessage; }; /** * Bootstraps the component context from a UNO installation. - * + * * @return a bootstrapped component context * @exception BootstrapException * Thrown in case bootstrap() signals an exception due to a @@ -194,7 +194,7 @@ private: * * @since UDK 3.2.0 */ -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > +::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL bootstrap(); /** diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx index 5827c630da23..54db23a4e5d3 100644 --- a/cppuhelper/inc/cppuhelper/compbase.hxx +++ b/cppuhelper/inc/cppuhelper/compbase.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/cppuhelper/inc/cppuhelper/compbase1.hxx b/cppuhelper/inc/cppuhelper/compbase1.hxx index b968c3278eb1..0f146f4eafc9 100644 --- a/cppuhelper/inc/cppuhelper/compbase1.hxx +++ b/cppuhelper/inc/cppuhelper/compbase1.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 @@ -45,14 +45,14 @@ namespace cppu /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and ::com::sun::star::lang::XComponent. - + Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -80,7 +80,7 @@ namespace cppu virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) { WeakComponentImplHelperBase::addEventListener(xListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) - { WeakComponentImplHelperBase::removeEventListener(xListener); } + { WeakComponentImplHelperBase::removeEventListener(xListener); } virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) { return WeakComponentImplHelper_getTypes( cd::get() ); } virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1 > diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/cppuhelper/inc/cppuhelper/compbase10.hxx index 0dd725b35a16..9c3fd193af1f 100644 --- a/cppuhelper/inc/cppuhelper/compbase10.hxx +++ b/cppuhelper/inc/cppuhelper/compbase10.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx b/cppuhelper/inc/cppuhelper/compbase11.hxx index 5b88983ac6fd..efb9a9f6b321 100644 --- a/cppuhelper/inc/cppuhelper/compbase11.hxx +++ b/cppuhelper/inc/cppuhelper/compbase11.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > diff --git a/cppuhelper/inc/cppuhelper/compbase12.hxx b/cppuhelper/inc/cppuhelper/compbase12.hxx index f79af5223571..8a43f50098a1 100644 --- a/cppuhelper/inc/cppuhelper/compbase12.hxx +++ b/cppuhelper/inc/cppuhelper/compbase12.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,10 +98,10 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/cppuhelper/inc/cppuhelper/compbase2.hxx index 9518c01f85fd..c102f9726367 100644 --- a/cppuhelper/inc/cppuhelper/compbase2.hxx +++ b/cppuhelper/inc/cppuhelper/compbase2.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2 > diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx index 04bac81f9e2a..9e8c18e754a2 100644 --- a/cppuhelper/inc/cppuhelper/compbase3.hxx +++ b/cppuhelper/inc/cppuhelper/compbase3.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3 > diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/cppuhelper/inc/cppuhelper/compbase4.hxx index a482e4bf0be7..8f7bb7634fdb 100644 --- a/cppuhelper/inc/cppuhelper/compbase4.hxx +++ b/cppuhelper/inc/cppuhelper/compbase4.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 > diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx index 2fdaf471aa73..dfdbe976eff8 100644 --- a/cppuhelper/inc/cppuhelper/compbase5.hxx +++ b/cppuhelper/inc/cppuhelper/compbase5.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 > diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/cppuhelper/inc/cppuhelper/compbase6.hxx index 3c80d59169fe..c871e06e3fb7 100644 --- a/cppuhelper/inc/cppuhelper/compbase6.hxx +++ b/cppuhelper/inc/cppuhelper/compbase6.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 > diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx index 43d4de7d787a..42c3c040ccff 100644 --- a/cppuhelper/inc/cppuhelper/compbase7.hxx +++ b/cppuhelper/inc/cppuhelper/compbase7.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 > diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/cppuhelper/inc/cppuhelper/compbase8.hxx index 8df9b4fb5eff..3742753e1986 100644 --- a/cppuhelper/inc/cppuhelper/compbase8.hxx +++ b/cppuhelper/inc/cppuhelper/compbase8.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -98,14 +98,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 > diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx index a2f90b45dae6..7ca131ae2be9 100644 --- a/cppuhelper/inc/cppuhelper/compbase9.hxx +++ b/cppuhelper/inc/cppuhelper/compbase9.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 @@ -49,10 +49,10 @@ namespace cppu Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -97,14 +97,14 @@ namespace cppu call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). - + @deprecated */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 > diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx index 121927b3320c..7d79304b2f2f 100644 --- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/compbase_ex.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 @@ -49,7 +49,7 @@ protected: /** broadcast helper for disposing events */ ::cppu::OBroadcastHelper rBHelper; - + /** this function is called upon disposing the component */ virtual void SAL_CALL disposing(); @@ -63,7 +63,7 @@ public: /** Destructor */ virtual ~WeakComponentImplHelperBase() SAL_THROW( () ); - + // these are here to force memory de/allocation to sal lib. inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) { return ::rtl_allocateMemory( nSize ); } @@ -73,7 +73,7 @@ public: { return pMem; } inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) {} - + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); @@ -101,15 +101,15 @@ class SAL_NO_VTABLE WeakAggComponentImplHelperBase { protected: ::cppu::OBroadcastHelper rBHelper; - + /** Is called upon disposing the component. */ virtual void SAL_CALL disposing(); - + WeakAggComponentImplHelperBase( ::osl::Mutex & rMutex ) SAL_THROW( () ); public: virtual ~WeakAggComponentImplHelperBase() SAL_THROW( () ); - + // these are here to force memory de/allocation to sal lib. inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) { return ::rtl_allocateMemory( nSize ); } @@ -119,7 +119,7 @@ public: { return pMem; } inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) {} - + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx index 76f74d402ab5..92eb60389afb 100644 --- a/cppuhelper/inc/cppuhelper/component.hxx +++ b/cppuhelper/inc/cppuhelper/component.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,13 +39,13 @@ namespace cppu -{ +{ /** Deprecated. Helper for implementing ::com::sun::star::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. - + @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @deprecated @@ -57,7 +57,7 @@ class OComponentHelper { public: /** Constructor. - + @param rMutex the mutex used to protect multi-threaded access; lifetime must be longer than the lifetime of this object. @@ -66,7 +66,7 @@ public: /** Dewstructor. If this object was not disposed previously, object will be disposed manually. */ virtual ~OComponentHelper() SAL_THROW( (::com::sun::star::uno::RuntimeException) ); - + // XAggregation virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) @@ -78,7 +78,7 @@ public: throw (); virtual void SAL_CALL release() throw (); - + /** @attention XTypeProvider::getImplementationId() has to be implemented separately! */ @@ -89,7 +89,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); @@ -99,14 +99,14 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - + protected: /** Called in dispose method after the listeners were notified. */ virtual void SAL_CALL disposing(); - + /** @internal */ - OBroadcastHelper rBHelper; + OBroadcastHelper rBHelper; private: /** @internal */ inline OComponentHelper( const OComponentHelper & ) SAL_THROW( () ); @@ -114,7 +114,7 @@ private: inline OComponentHelper & operator = ( const OComponentHelper & ) SAL_THROW( () ); }; -} +} #endif diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/cppuhelper/inc/cppuhelper/component_context.hxx index 10ecc2a885c4..2ab6a0cf25cf 100644 --- a/cppuhelper/inc/cppuhelper/component_context.hxx +++ b/cppuhelper/inc/cppuhelper/component_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 @@ -40,7 +40,7 @@ namespace cppu struct ContextEntry_Init { /** late init denotes a object that will be raised when first get() is calling for it - + The context implementation expects either a ::com::sun::star::lang::XSingleComponentFactory object as value (to instanciate the object) or a string as value for raising a service via the used service manager. @@ -59,7 +59,7 @@ struct ContextEntry_Init : bLateInitService( false ) {} /** Ctor. - + @param name_ name of entry @param value_ @@ -79,7 +79,7 @@ struct ContextEntry_Init }; /** Creates a component context with the given entries. - + @param pEntries array of entries @param nEntries number of entries @param xDelegate delegation to further context, if value was not found diff --git a/cppuhelper/inc/cppuhelper/exc_hlp.hxx b/cppuhelper/inc/cppuhelper/exc_hlp.hxx index 5b07c05d9edc..3d70b9eb6a4d 100644 --- a/cppuhelper/inc/cppuhelper/exc_hlp.hxx +++ b/cppuhelper/inc/cppuhelper/exc_hlp.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,12 +32,12 @@ #include <com/sun/star/uno/Any.hxx> namespace cppu -{ +{ /** This function throws the exception given by rExc. The given value has to be of typeclass EXCEPTION and must be dervived from or of type com.sun.star.uno.Exception. - + @param rExc exception to be thrown. */ @@ -46,7 +46,7 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc ) /** Use this function to get the dynamic type of a caught C++-UNO exception; completes the above function throwing exceptions generically. - + try { ... @@ -61,17 +61,17 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc ) ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); ... } - + Restrictions: - use only for caught C++-UNO exceptions (UNOIDL defined) - only as first statement in a catch block! - don't do a C++ rethrow (throw;) after you have called this function - call getCaughtException() just once in your catch block! (function internally uses a C++ rethrow) - + @return caught UNO exception - + @attention Caution! This function is limited to the same C++ compiler runtime library. E.g. for MSVC, this means that the catch handler code (the one @@ -86,7 +86,7 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc ) in newer UDK versions without being recompiled, because those newer UDK (-> OOo versions) potentially use newer C++ runtime libraries which most often become incompatible! - + But this function ought to be usable for most OOo internal C++-UNO development, because the whole OOo code base is compiled using the same C++ compiler (and linking against one runtime library). diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx index 0ba8c603a8ed..538d85c51e85 100644 --- a/cppuhelper/inc/cppuhelper/factory.hxx +++ b/cppuhelper/inc/cppuhelper/factory.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,11 +40,11 @@ //################################################################################################## -#define COMPONENT_GETENV "component_getImplementationEnvironment" +#define COMPONENT_GETENV "component_getImplementationEnvironment" #define COMPONENT_GETENVEXT "component_getImplementationEnvironmentExt" -#define COMPONENT_GETDESCRIPTION "component_getDescription" -#define COMPONENT_WRITEINFO "component_writeInfo" -#define COMPONENT_GETFACTORY "component_getFactory" +#define COMPONENT_GETDESCRIPTION "component_getDescription" +#define COMPONENT_WRITEINFO "component_writeInfo" +#define COMPONENT_GETFACTORY "component_getFactory" typedef struct _uno_Environment uno_Environment; @@ -52,7 +52,7 @@ typedef struct _uno_Environment uno_Environment; Function determines the environment of the component implementation, i.e. which compiler compiled it. If the environment is NOT session specific (needs no additional context), then this function should return the environment type name and leave ppEnv (to 0). - + @paramppEnvTypeName environment type name; string must be constant @param ppEnv function returns its environment if the environment is session specific, i.e. has special context @@ -79,7 +79,7 @@ typedef void (SAL_CALL * component_getImplementationEnvironmentExtFunc)( /** Function pointer declaration. Function retrieves a component description. - + @return an XML formatted string containing a short component description @deprecated */ @@ -87,7 +87,7 @@ typedef const sal_Char * (SAL_CALL * component_getDescriptionFunc)(void); /** Function pointer declaration. Function writes component registry info, at least writing the supported service names. - + @param pServiceManager a service manager (the type is an XMultiServiceFactory that can be used by the environment returned by component_getImplementationEnvironment) @@ -120,7 +120,7 @@ typedef void * (SAL_CALL * component_getFactoryFunc)( //################################################################################################## namespace cppu -{ +{ /** Function pointer declaration. Function creates component instance passing the component context to be used. @@ -134,7 +134,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >( SAL_THROW( (::com::sun::star::uno::Exception) ); /** Creates a single component factory supporting the XSingleComponentFactory interface. - + @param fptr function pointer for instanciating the object @param rImplementationName implementation name of service @param rServiceNames supported services @@ -149,12 +149,12 @@ SAL_CALL createSingleComponentFactory( SAL_THROW( () ); /** Creates a single service factory which holds the instance created only once. - + @param fptr function pointer for instanciating the object @param rImplementationName implementation name of service @param rServiceNames supported services @param pModCount for future extension (library unloading concept). - + @see createSingleComponentFactory */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL @@ -166,7 +166,7 @@ createOneInstanceComponentFactory( SAL_THROW( () ); /** Deprecated. The type of the instanciate function used as argument of the create*Fcatory functions. - + @see createSingleFactory @see createOneInstanceFactory @deprecated @@ -175,15 +175,15 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SA const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager ); /** Deprecated. Creates a single service factory. - - @param rServiceManager the service manager used by the implementation. - @param rImplementationName the implementation name. An empty string is possible. + + @param rServiceManager the service manager used by the implementation. + @param rImplementationName the implementation name. An empty string is possible. @param ComponentInstantiation the function pointer to create an object. - @param rServiceNames the service supported by the implementation. + @param rServiceNames the service supported by the implementation. @param pModCount for future extension (library unloading concept). @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory and XComponent. - + @see createOneInstanceFactory @deprecated */ @@ -201,12 +201,12 @@ createSingleFactory( XSingleServiceFactory are forwarded. @attention The XComponent interface is not supported! - - @param rServiceManager the service manager used by the implementation. - @param xSingleServiceFactory the wrapped service factory. + + @param rServiceManager the service manager used by the implementation. + @param xSingleServiceFactory the wrapped service factory. @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory. - + @see createSingleFactory @deprecated */ @@ -217,61 +217,61 @@ createFactoryProxy( SAL_THROW( () ); /** Deprecated. Creates a single service factory which holds the instance created only once. - - @param rServiceManager the service manager used by the implementation. - @param rImplementationName the implementation name. An empty string is possible. + + @param rServiceManager the service manager used by the implementation. + @param rImplementationName the implementation name. An empty string is possible. @param ComponentInstantiation the function pointer to create an object. - @param rServiceNames the service supported by the implementation. + @param rServiceNames the service supported by the implementation. @param pModCount for future extension (library unloading concept). @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory and XComponent. - + @see createSingleFactory @deprecated */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createOneInstanceFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, - const ::rtl::OUString & rComponentName, + const ::rtl::OUString & rComponentName, ComponentInstantiation pCreateFunction, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rServiceNames, rtl_ModuleCount * pModCount = 0 ) SAL_THROW( () ); /** Deprecated. Creates a single service factory based on a registry. - - @param rServiceManager the service manager used by the implementation. - @param rImplementationName the implementation name. An empty string is possible. - @param rImplementationKey the registry key of the implementation section. + + @param rServiceManager the service manager used by the implementation. + @param rImplementationName the implementation name. An empty string is possible. + @param rImplementationKey the registry key of the implementation section. @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory and XComponent. @deprecated */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createSingleRegistryFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, - const ::rtl::OUString & rImplementationName, + const ::rtl::OUString & rImplementationName, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey ) SAL_THROW( () ); /** Deprecated. Creates a single service factory which holds the instance created only once based on a registry. - - @param rServiceManager the service manager used by the implementation. - @param rImplementationName the implementation name. An empty string is possible. - @param rImplementationKey the registry key of the implementation section. + + @param rServiceManager the service manager used by the implementation. + @param rImplementationName the implementation name. An empty string is possible. + @param rImplementationKey the registry key of the implementation section. @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory and XComponent. - + @see createSingleRegistryFactory @deprecated */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, - const ::rtl::OUString & rComponentName, + const ::rtl::OUString & rComponentName, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey ) SAL_THROW( () ); -} +} #endif diff --git a/cppuhelper/inc/cppuhelper/findsofficepath.h b/cppuhelper/inc/cppuhelper/findsofficepath.h index b1bbc50e3340..8a7027ebf906 100644 --- a/cppuhelper/inc/cppuhelper/findsofficepath.h +++ b/cppuhelper/inc/cppuhelper/findsofficepath.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/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx index fe816ed18acf..9d56d4c5f51b 100644 --- a/cppuhelper/inc/cppuhelper/implbase.hxx +++ b/cppuhelper/inc/cppuhelper/implbase.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 @@ -110,7 +110,7 @@ struct ClassData : public ClassDataBase /** type entries array */ Type_Offset arType2Offset[1]; - + /** init call for supporting com.sun.star.lang.XTypeProvider */ void SAL_CALL initTypeProvider() SAL_THROW( () ); @@ -163,14 +163,14 @@ struct ClassData : public ClassDataBase So there is commonly no need to use these macros. Though, you may need to implement more than 12 interfaces. Then you have to declare something like the following in your headers (where N is your demanded number of interfaces): - + #define __IFC3 Ifc1, Ifc2, Ifc3, ... up to N #define __CLASS_IFC3 class Ifc1, class Ifc2, class Ifc3, ... up to N #define __PUBLIC_IFC3 public Ifc1, public Ifc2, public Ifc3, ... up to N __DEF_IMPLHELPER_PRE( N ) __IFC_WRITEOFFSET( 1 ) __IFC_WRITEOFFSET( 2 ) __IFC_WRITEOFFSET( 3 ), ... up to N __DEF_IMPLHELPER_POST( N ) - + @internal */ #define __DEF_IMPLHELPER_PRE( N ) \ diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx index 6974c4c57507..c7de4ad26e0b 100644 --- a/cppuhelper/inc/cppuhelper/implbase1.hxx +++ b/cppuhelper/inc/cppuhelper/implbase1.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 @@ -61,10 +61,10 @@ namespace cppu return reinterpret_cast< class_data * >(&s_cd); } }; - + /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -87,7 +87,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -124,7 +124,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -162,7 +162,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -229,14 +229,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase10.hxx b/cppuhelper/inc/cppuhelper/implbase10.hxx index 972de4544fe9..26ea7525732d 100644 --- a/cppuhelper/inc/cppuhelper/implbase10.hxx +++ b/cppuhelper/inc/cppuhelper/implbase10.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl > struct ImplClassData10 { class_data* operator ()() @@ -73,7 +73,7 @@ namespace cppu /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -97,7 +97,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -130,7 +130,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -168,7 +168,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -230,14 +230,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase11.hxx b/cppuhelper/inc/cppuhelper/implbase11.hxx index 49a1149b68fa..c262cd6ae5b0 100644 --- a/cppuhelper/inc/cppuhelper/implbase11.hxx +++ b/cppuhelper/inc/cppuhelper/implbase11.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl > struct ImplClassData11 { class_data* operator ()() @@ -74,7 +74,7 @@ namespace cppu /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -98,7 +98,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -131,7 +131,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -169,7 +169,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -231,14 +231,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/cppuhelper/inc/cppuhelper/implbase12.hxx index 0005abf07f3d..a4ef396c0bd6 100644 --- a/cppuhelper/inc/cppuhelper/implbase12.hxx +++ b/cppuhelper/inc/cppuhelper/implbase12.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl > struct ImplClassData12 { class_data* operator ()() @@ -75,7 +75,7 @@ namespace cppu /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -99,7 +99,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -132,7 +132,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -170,7 +170,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -232,14 +232,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/cppuhelper/inc/cppuhelper/implbase2.hxx index 99282f6a0a16..8aa6fb4ceeda 100644 --- a/cppuhelper/inc/cppuhelper/implbase2.hxx +++ b/cppuhelper/inc/cppuhelper/implbase2.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,7 +64,7 @@ namespace cppu /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your base class defines method implementations, acquire(), release() and delegates incoming @@ -88,7 +88,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -121,7 +121,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -159,7 +159,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -221,14 +221,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase3.hxx b/cppuhelper/inc/cppuhelper/implbase3.hxx index 1aad6ce7b940..e3cca581febd 100644 --- a/cppuhelper/inc/cppuhelper/implbase3.hxx +++ b/cppuhelper/inc/cppuhelper/implbase3.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 @@ -65,7 +65,7 @@ namespace cppu /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -89,7 +89,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -122,7 +122,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -161,7 +161,7 @@ namespace cppu BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. also has to have a default ctor. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -223,14 +223,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/cppuhelper/inc/cppuhelper/implbase4.hxx index ad00b829ee88..c982fca2a9ca 100644 --- a/cppuhelper/inc/cppuhelper/implbase4.hxx +++ b/cppuhelper/inc/cppuhelper/implbase4.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl > struct ImplClassData4 { class_data* operator ()() @@ -67,7 +67,7 @@ namespace cppu /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -91,7 +91,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -124,7 +124,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -162,7 +162,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -224,14 +224,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/cppuhelper/inc/cppuhelper/implbase5.hxx index 8d4e216e0b00..c2eff30c0df1 100644 --- a/cppuhelper/inc/cppuhelper/implbase5.hxx +++ b/cppuhelper/inc/cppuhelper/implbase5.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl > struct ImplClassData5 { class_data* operator ()() @@ -68,7 +68,7 @@ namespace cppu /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -92,7 +92,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -125,7 +125,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -163,7 +163,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -225,14 +225,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase6.hxx b/cppuhelper/inc/cppuhelper/implbase6.hxx index c545284145e6..ca11813140aa 100644 --- a/cppuhelper/inc/cppuhelper/implbase6.hxx +++ b/cppuhelper/inc/cppuhelper/implbase6.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl > struct ImplClassData6 { class_data* operator ()() @@ -66,10 +66,10 @@ namespace cppu return reinterpret_cast< class_data * >(&s_cd); } }; - + /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -93,7 +93,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -126,7 +126,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -164,7 +164,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -226,14 +226,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/cppuhelper/inc/cppuhelper/implbase7.hxx index 9a254f40f731..620e0e0a583c 100644 --- a/cppuhelper/inc/cppuhelper/implbase7.hxx +++ b/cppuhelper/inc/cppuhelper/implbase7.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl > struct ImplClassData7 { class_data* operator ()() @@ -68,10 +68,10 @@ namespace cppu } }; - + /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -95,7 +95,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -128,7 +128,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -166,7 +166,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -228,14 +228,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase8.hxx b/cppuhelper/inc/cppuhelper/implbase8.hxx index e817dc388e8a..31bda399bc61 100644 --- a/cppuhelper/inc/cppuhelper/implbase8.hxx +++ b/cppuhelper/inc/cppuhelper/implbase8.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl > struct ImplClassData8 { class_data* operator ()() @@ -71,7 +71,7 @@ namespace cppu /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -95,7 +95,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -128,7 +128,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -166,7 +166,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -228,14 +228,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase9.hxx b/cppuhelper/inc/cppuhelper/implbase9.hxx index a070c71cab3e..911caac08ae6 100644 --- a/cppuhelper/inc/cppuhelper/implbase9.hxx +++ b/cppuhelper/inc/cppuhelper/implbase9.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 @@ -44,7 +44,7 @@ namespace cppu }; /** @internal */ - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl > + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl > struct ImplClassData9 { class_data* operator ()() @@ -70,10 +70,10 @@ namespace cppu } }; - + /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s) including acquire()/ @@ -97,7 +97,7 @@ namespace cppu /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject). - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -130,7 +130,7 @@ namespace cppu If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. - + @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -168,7 +168,7 @@ namespace cppu and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). @@ -230,14 +230,14 @@ namespace cppu All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. - + @attention The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface, ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx index 267bdf6b04cc..056bb3760f8a 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex.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,7 +39,7 @@ /* If you need to define implementation helper classes that deal with more than 12 interfaces, then use macros as follows, e.g. for 3 interfaces: - + #include <cppuhelper/implbase_ex_pre.hxx> #define __IFC_EX_TYPE_INIT3( class_cast ) \ __IFC_EX_TYPE_INIT( class_cast, 1 ), __IFC_EX_TYPE_INIT( class_cast, 2 ), \ @@ -84,19 +84,19 @@ struct class_data /** number of supported types in m_typeEntries */ sal_Int16 m_nTypes; - + /** determines whether m_typeEntries is initialized and carries unacquired type refs */ sal_Bool m_storedTypeRefs; - + /** determines whether an implementation id was created in m_id */ sal_Bool m_createdId; - + /** implementation id */ sal_Int8 m_id[ 16 ]; - + /** type, object offset */ type_entry m_typeEntries[ 1 ]; diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx index 83849e5e6cab..3a2f4ca4ad6c 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex_post.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/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx index 337fa1ecdc9a..7eee744cd4c0 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex_pre.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/cppuhelper/inc/cppuhelper/implementationentry.hxx b/cppuhelper/inc/cppuhelper/implementationentry.hxx index 1ff7e49676b7..eb49075d1350 100644 --- a/cppuhelper/inc/cppuhelper/implementationentry.hxx +++ b/cppuhelper/inc/cppuhelper/implementationentry.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 @@ namespace cppu { /** One struct instance represents all data necessary for registering one service implementation. - + */ struct ImplementationEntry { @@ -97,7 +97,7 @@ sal_Bool component_writeInfoHelper( This is a reference to the registry key, where the implementation data has been written to. @param entries Each element of the entries-array must contains a function pointer - table for creating a factor of the implementation. The end of the array + table for creating a factor of the implementation. The end of the array must be marked with a 0 entry in the create-function. @return 0 if the helper failed to instantiate a factory, otherwise an acquired pointer to a factory. diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h index ae3c2adf1457..6242de88b6d8 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.h +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.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 @@ -43,7 +43,7 @@ /** */ //for docpp namespace cppu -{ +{ namespace detail { @@ -62,7 +62,7 @@ class OInterfaceContainerHelper; This is the iterator of a InterfaceContainerHelper. Typically one constructs an instance on the stack for one firing session. It is not allowed to assign or copy an instance of this class. - + @see OInterfaceContainerHelper */ class OInterfaceIteratorHelper @@ -71,15 +71,15 @@ public: /** Create an iterator over the elements of the container. The iterator copies the elements of the conatainer. A change to the container - during the lifetime of an iterator is allowed and does not + during the lifetime of an iterator is allowed and does not affect the iterator-instance. The iterator and the container take cares themself for concurrent access, no additional guarding is necessary. - + Remark: The copy is on demand. The iterator copy the elements only if the container change the contents. It is not allowed to destroy the container as long as an iterator exist. - - @param rCont the container of the elements. + + @param rCont the container of the elements. */ OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont ) SAL_THROW( () ); @@ -93,34 +93,34 @@ public: { return nRemain != 0; } /** Return the next element of the iterator. Calling this method if hasMoreElements() has returned sal_False, is an error. Cast the - returned pointer to the + returned pointer to the */ - ::com::sun::star::uno::XInterface * SAL_CALL next() SAL_THROW( () ); + ::com::sun::star::uno::XInterface * SAL_CALL next() SAL_THROW( () ); /** Removes the current element (the last one returned by next()) from the underlying container. Calling this method before next() has been called or calling it twice with no next() - inbetween is an error. + inbetween is an error. */ void SAL_CALL remove() SAL_THROW( () ); - + private: - OInterfaceContainerHelper & rCont; - sal_Bool bIsList; + OInterfaceContainerHelper & rCont; + sal_Bool bIsList; detail::element_alias aData; - sal_Int32 nRemain; + sal_Int32 nRemain; OInterfaceIteratorHelper( const OInterfaceIteratorHelper & ) SAL_THROW( () ); - OInterfaceIteratorHelper & operator = ( const OInterfaceIteratorHelper & ) SAL_THROW( () ); + OInterfaceIteratorHelper & operator = ( const OInterfaceIteratorHelper & ) SAL_THROW( () ); }; //=================================================================== /** A container of interfaces. To access the elements use an iterator. This implementation is thread save. - + @see OInterfaceIteratorHelper */ class OInterfaceContainerHelper @@ -135,11 +135,11 @@ public: { return pMem; } inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) {} - + /** - Create an interface container. - - @param rMutex the mutex to protect multi thread access. + Create an interface container. + + @param rMutex the mutex to protect multi thread access. The lifetime must be longer than the lifetime of this object. */ @@ -169,7 +169,7 @@ public: removeInterface() the same number of times. In the latter case, you will also get events fired more than once (if the interface is a listener interface). - + @param rxIFace interface to be added; it is allowed to insert null or the same interface more than once @@ -178,7 +178,7 @@ public: */ sal_Int32 SAL_CALL addInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW( () ); /** Removes an element from the container. It uses interface equality to remove the interface. - + @param rxIFace interface to be removed @return @@ -197,10 +197,10 @@ public: /** Executes a functor for each contained listener of specified type, e.g. <code>forEach<awt::XPaintListener>(...</code>. - + If a com::sun::star::lang::DisposedException occurs which relates to the called listener, then that listener is removed from the container. - + @tpl ListenerT listener type @tpl FuncT unary functor type, let your compiler deduce this for you @param func unary functor object expecting an argument of type @@ -208,7 +208,7 @@ public: */ template <typename ListenerT, typename FuncT> inline void forEach( FuncT const& func ); - + /** Calls a UNO listener method for each contained listener. The listener method must take a single argument of type EventT, @@ -216,7 +216,7 @@ public: If a com::sun::star::lang::DisposedException occurs which relates to the called listener, then that listener is removed from the container. - + @tpl ListenerT UNO event listener type, let your compiler deduce this for you @tpl EventT event type, let your compiler deduce this for you @param NotificationMethod @@ -232,19 +232,19 @@ public: */ template< typename ListenerT, typename EventT > inline void notifyEach( void ( SAL_CALL ListenerT::*NotificationMethod )( const EventT& ), const EventT& Event ); - + private: friend class OInterfaceIteratorHelper; - /** + /** bIsList == TRUE -> aData.pAsSequence of type Sequence< XInterfaceSequence >, otherwise aData.pAsInterface == of type (XEventListener *) */ detail::element_alias aData; - ::osl::Mutex & rMutex; + ::osl::Mutex & rMutex; /** TRUE -> used by an iterator. */ - sal_Bool bInUse; + sal_Bool bInUse; /** TRUE -> aData.pAsSequence is of type Sequence< XInterfaceSequence >. */ - sal_Bool bIsList; + sal_Bool bIsList; OInterfaceContainerHelper( const OInterfaceContainerHelper & ) SAL_THROW( () ); OInterfaceContainerHelper & operator = ( const OInterfaceContainerHelper & ) SAL_THROW( () ); @@ -305,7 +305,7 @@ inline void OInterfaceContainerHelper::notifyEach( void ( SAL_CALL ListenerT::*N //=================================================================== /** A helper class to store interface references of different types. - + @see OInterfaceIteratorHelper @see OInterfaceContainerHelper */ @@ -322,11 +322,11 @@ public: { return pMem; } inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) {} - + /** Create a container of interface containers. - - @param rMutex the mutex to protect multi thread access. + + @param rMutex the mutex to protect multi thread access. The lifetime must be longer than the lifetime of this object. */ @@ -348,17 +348,17 @@ public: was not created, null was returned. */ inline OInterfaceContainerHelper * SAL_CALL getContainer( const key & ) const SAL_THROW( () ); - + /** Inserts an element into the container with the specified key. The position is not specified, thus it is not specified in which order events are fired. - + @attention If you add the same interface more than once, then it will be added to the elements list more than once and thus if you want to remove that interface from the list, you have to call removeInterface() the same number of times. In the latter case, you will also get events fired more than once (if the interface is a listener interface). - + @param rKey the id of the container @param r @@ -367,14 +367,14 @@ public: @return the new count of elements in the container */ - inline sal_Int32 SAL_CALL addInterface( + inline sal_Int32 SAL_CALL addInterface( const key & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ) SAL_THROW( () ); - + /** Removes an element from the container with the specified key. It uses interface equality to remove the interface. - + @param rKey the id of the container @param rxIFace @@ -382,17 +382,17 @@ public: @return the new count of elements in the container */ - inline sal_Int32 SAL_CALL removeInterface( + inline sal_Int32 SAL_CALL removeInterface( const key & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW( () ); - + /** Call disposing on all references in the container, that support XEventListener. Then clears the container. @param rEvt the event object which is passed during disposing() call */ - inline void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); + inline void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); /** Remove all elements of all containers. Does not delete the container. */ @@ -402,7 +402,7 @@ public: private: typedef ::std::vector< std::pair < key , void* > > InterfaceMap; InterfaceMap *m_pMap; - ::osl::Mutex & rMutex; + ::osl::Mutex & rMutex; inline typename InterfaceMap::iterator find(const key &rKey) const { @@ -418,7 +418,7 @@ private: } return iter; } - + inline OMultiTypeInterfaceContainerHelperVar( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW( () ); inline OMultiTypeInterfaceContainerHelperVar & operator = ( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW( () ); }; @@ -426,26 +426,26 @@ private: -/** +/** This struct contains the standard variables of a broadcaster. Helper classes only know a reference to this struct instead of references to the four members. The access to the members must be guarded with rMutex. - + The additional template parameter keyType has been added, because gcc can't compile addListener( const container::keyType &key ). */ -template < class container , class keyType > +template < class container , class keyType > struct OBroadcastHelperVar { /** The shared mutex. */ - ::osl::Mutex & rMutex; + ::osl::Mutex & rMutex; /** ListenerContainer class is thread save. */ - container aLC; + container aLC; /** Dispose call ready. */ - sal_Bool bDisposed; + sal_Bool bDisposed; /** In dispose call. */ - sal_Bool bInDispose; + sal_Bool bInDispose; /** Initialize the structur. bDispose and bInDispose are set to false. @@ -527,11 +527,11 @@ public: { return pMem; } inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) {} - + /** Create a container of interface containers. - - @param rMutex the mutex to protect multi thread access. + + @param rMutex the mutex to protect multi thread access. The lifetime must be longer than the lifetime of this object. */ @@ -552,17 +552,17 @@ public: was not created, null was returned. */ OInterfaceContainerHelper * SAL_CALL getContainer( const ::com::sun::star::uno::Type & rKey ) const SAL_THROW( () ); - + /** Inserts an element into the container with the specified key. The position is not specified, thus it is not specified in which order events are fired. - + @attention If you add the same interface more than once, then it will be added to the elements list more than once and thus if you want to remove that interface from the list, you have to call removeInterface() the same number of times. In the latter case, you will also get events fired more than once (if the interface is a listener interface). - + @param rKey the id of the container @param r @@ -571,14 +571,14 @@ public: @return the new count of elements in the container */ - sal_Int32 SAL_CALL addInterface( + sal_Int32 SAL_CALL addInterface( const ::com::sun::star::uno::Type & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ) SAL_THROW( () ); - + /** Removes an element from the container with the specified key. It uses interface equality to remove the interface. - + @param rKey the id of the container @param rxIFace @@ -586,25 +586,25 @@ public: @return the new count of elements in the container */ - sal_Int32 SAL_CALL removeInterface( + sal_Int32 SAL_CALL removeInterface( const ::com::sun::star::uno::Type & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW( () ); - + /** Call disposing on all object in the container that support XEventListener. Than clear the container. */ - void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); + void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); /** Remove all elements of all containers. Does not delete the container. */ void SAL_CALL clear() SAL_THROW( () ); - + typedef ::com::sun::star::uno::Type keyType; private: void *m_pMap; - ::osl::Mutex & rMutex; + ::osl::Mutex & rMutex; inline OMultiTypeInterfaceContainerHelper( const OMultiTypeInterfaceContainerHelper & ) SAL_THROW( () ); inline OMultiTypeInterfaceContainerHelper & operator = ( const OMultiTypeInterfaceContainerHelper & ) SAL_THROW( () ); @@ -612,7 +612,7 @@ private: typedef OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper , OMultiTypeInterfaceContainerHelper::keyType > OBroadcastHelper; -} +} #endif diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx index d9c347ecc0cf..68781c9d5ac1 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.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 @@ namespace cppu -{ +{ template< class key , class hashImpl , class equalImpl > inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex & rMutex_ ) @@ -94,7 +94,7 @@ inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelper //=================================================================== template< class key , class hashImpl , class equalImpl > -OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainer( +OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainer( const key & rKey ) const SAL_THROW( () ) { ::osl::MutexGuard aGuard( rMutex ); @@ -107,7 +107,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImp //=================================================================== template< class key , class hashImpl , class equalImpl > -sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::addInterface( +sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::addInterface( const key & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener ) SAL_THROW( () ) @@ -126,8 +126,8 @@ sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::a //=================================================================== template< class key , class hashImpl , class equalImpl > -inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::removeInterface( - const key & rKey, +inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::removeInterface( + const key & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener ) SAL_THROW( () ) { @@ -158,10 +158,10 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::dispos { typedef OInterfaceContainerHelper* ppp; ppListenerContainers = new ppp[nSize]; - + typename InterfaceMap::iterator iter = m_pMap->begin(); typename InterfaceMap::iterator end = m_pMap->end(); - + typename InterfaceMap::size_type i = 0; while( iter != end ) { @@ -197,7 +197,7 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::clear( } -} +} #endif diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx index 6ab242f111a0..41a9f1ae4785 100644 --- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx +++ b/cppuhelper/inc/cppuhelper/propertysetmixin.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/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx index a288feb284ba..0beca5ab0bad 100644 --- a/cppuhelper/inc/cppuhelper/propshlp.hxx +++ b/cppuhelper/inc/cppuhelper/propshlp.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 @@ -71,7 +71,7 @@ public: /** Return the property members Name and Attribute from the handle nHandle. - @param nHandle the handle of a property. If the values of the handles + @param nHandle the handle of a property. If the values of the handles are sorted in the same way as the names and the highest handle value is getCount() -1, than it must be an indexed acces to the property array. @param pPropName is an out parameter filled with property name of the property with the @@ -88,21 +88,21 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) = 0; /** Return the property with the name rPropertyName. - @param rPropertyName the name of the property. - @exception UnknownPropertyException thrown if the property name is unknown. + @param rPropertyName the name of the property. + @exception UnknownPropertyException thrown if the property name is unknown. */ virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException) = 0; /** Return true if the property with the name rPropertyName exist, otherwise false. - @param rPropertyName the name of the property. + @param rPropertyName the name of the property. */ virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName) = 0; /** Return the handle of the property with the name rPropertyName. If the property does not exist -1 is returned. - @param rPropertyName the name of the property. + @param rPropertyName the name of the property. */ virtual sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName ) = 0; /** @@ -123,11 +123,11 @@ class OPropertyArrayHelper : public IPropertyArrayHelper public: /** Create an object which supports the common property interfaces. - - @param pProps array of properties + + @param pProps array of properties The array pProps should be sorted. - @param nElements is the number of properties in the pProps structure. - @param bSorted indicates that the elements are sorted. + @param nElements is the number of properties in the pProps structure. + @param bSorted indicates that the elements are sorted. *********/ OPropertyArrayHelper( ::com::sun::star::beans::Property *pProps, @@ -151,8 +151,8 @@ public: */ sal_Int32 SAL_CALL getCount() const SAL_THROW( () ); /** - Return the property members Name and Attribute from the handle nHandle. - @param nHandle the handle of a property. If the values of the handles + Return the property members Name and Attribute from the handle nHandle. + @param nHandle the handle of a property. If the values of the handles are sorted in the same way as the names and the highest handle value is getCount() -1, than it is only an indexed acces to the property array. Otherwise it is a linear search through the array. @@ -170,21 +170,21 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void); /** Return the property with the name rPropertyName. - @param rPropertyName the name of the property. - @exception UnknownPropertyException thrown if the property name is unknown. + @param rPropertyName the name of the property. + @exception UnknownPropertyException thrown if the property name is unknown. */ virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException); /** Return true if the property with the name rPropertyName exist, otherwise false. - @param rPropertyName the name of the property. + @param rPropertyName the name of the property. */ virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName); /** Return the handle of the property with the name rPropertyName. If the property does not exist -1 is returned. - @param rPropertyName the name of the property. + @param rPropertyName the name of the property. */ virtual sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName ); /** @@ -208,9 +208,9 @@ private: /** True, If the values of the handles are sorted in the same way as the names - and the highest handle value is getCount() -1, otherwise false. + and the highest handle value is getCount() -1, otherwise false. */ - sal_Bool bRightOrdered; + sal_Bool bRightOrdered; }; @@ -246,8 +246,8 @@ public: /** Create a container of interface containers. - - @param rMutex the mutex to protect multi thread access. + + @param rMutex the mutex to protect multi thread access. The lifetime must be longer than the lifetime of this object. */ @@ -271,12 +271,12 @@ public: /** Insert an element in the container specified with the key. The position is not specified. - @param rKey the id of the container. - @param rxIFace the added interface. It is allowed to insert null or + @param rKey the id of the container. + @param rxIFace the added interface. It is allowed to insert null or the same pointer more than once. @return the new count of elements in the container. */ - sal_Int32 SAL_CALL addInterface( + sal_Int32 SAL_CALL addInterface( const sal_Int32 & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ) SAL_THROW( () ); @@ -284,11 +284,11 @@ public: /** Remove an element from the container specified with the key. It uses the equal definition of uno objects to remove the interfaces. - @param rKey the id of the container. - @param rxIFace the removed interface. + @param rKey the id of the container. + @param rxIFace the removed interface. @return the new count of elements in the container. */ - sal_Int32 SAL_CALL removeInterface( + sal_Int32 SAL_CALL removeInterface( const sal_Int32 & rKey, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW( () ); @@ -297,7 +297,7 @@ public: Call disposing on all objects in the container that support XEventListener. Then clear the container. */ - void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); + void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); /** Remove all elements of all containers. Does not delete the container. */ @@ -306,7 +306,7 @@ public: typedef sal_Int32 keyType; private: void *m_pMap; - ::osl::Mutex & rMutex; + ::osl::Mutex & rMutex; inline OMultiTypeInterfaceContainerHelperInt32( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_THROW( () ); inline OMultiTypeInterfaceContainerHelperInt32 & operator = ( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_THROW( () ); @@ -346,7 +346,7 @@ public: The XPropertyChangeListener and XVetoableChangeListener with no names are inserted in the rBHelper.aLC structure. So it is possible to advise property listeners with the connection point interfaces. But only listeners that listen to all property changes. - + */ class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet, public ::com::sun::star::beans::XFastPropertySet, @@ -354,7 +354,7 @@ class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet, { public: /** - @param rBHelper this structure contains the basic members of + @param rBHelper this structure contains the basic members of a broadcaster. The lifetime must be longer than the lifetime of this object. Stored in the variable rBHelper. @@ -362,13 +362,13 @@ public: OPropertySetHelper( OBroadcastHelper & rBHelper ) SAL_THROW( () ); /** Constructor. - + @param rBHelper this structure contains the basic members of a broadcaster. The lifetime must be longer than the lifetime of this object. Stored in the variable rBHelper. - + @param bIgnoreRuntimeExceptionsWhileFiring indicates whether occuring RuntimeExceptions will be ignored when firing notifications (vetoableChange((), @@ -382,13 +382,13 @@ public: OBroadcastHelper & rBHelper, bool bIgnoreRuntimeExceptionsWhileFiring ); /** Constructor. - + @param rBHelper this structure contains the basic members of a broadcaster. The lifetime must be longer than the lifetime of this object. Stored in the variable rBHelper. - + @param i_pFireEvents additional event notifier @@ -421,7 +421,7 @@ public: /** Send a disposing notification to the listeners in the conatiners aBoundLC and aVetoableLC. - + @see OComponentHelper */ void SAL_CALL disposing() SAL_THROW( () ); @@ -439,7 +439,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - /** Ignored if the property is not bound. */ + /** Ignored if the property is not bound. */ virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener) @@ -511,10 +511,10 @@ public: protected: /** This method fire events to all registered property listeners. - @param pnHandles the id's of the properties that changed. - @param pNewValues the new values of the properties. - @param pOldValues the old values of the properties. - @param nCount the number of elements in the arrays pnHandles, pNewValues and pOldValues. + @param pnHandles the id's of the properties that changed. + @param pNewValues the new values of the properties. + @param pOldValues the old values of the properties. + @param nCount the number of elements in the arrays pnHandles, pNewValues and pOldValues. @param bVetoable true means fire to VetoableChangeListener, false means fire to XPropertyChangedListener and XMultiPropertyChangedListener. */ @@ -527,7 +527,7 @@ protected: /** Set multiple properties with the handles. - @param nSeqLen the length of the arrays pHandles and Values. + @param nSeqLen the length of the arrays pHandles and Values. @param pHandles the handles of the properties. The number of elements in the Values sequence is the length of the handle array. A value of -1 of a handle means invalid property. These are ignored. @@ -552,7 +552,7 @@ protected: old value in rOldValue. A IllegalArgumentException is thrown. The method is not implemented in this class. After this call the vetoable listeners are notified. - + @param rConvertedValue the converted value. Only set if return is true. @param rOldValue the old value. Only set if return is true. @param nHandle the handle of the proberty. @@ -577,7 +577,7 @@ protected: -- ::com::sun::star::lang::IllegalArgumentException -- ::com::sun::star::lang::WrappedTargetException -- ::com::sun::star::uno::RuntimeException - + @param nHandle handle @param rValue @@ -597,7 +597,7 @@ protected: sal_Int32 nHandle ) const = 0; /** The common data of a broadcaster. Use the mutex, disposing state and the listener container. */ - OBroadcastHelper &rBHelper; + OBroadcastHelper &rBHelper; /** Container for the XProperyChangedListener. The listeners are inserted by handle. */ @@ -615,7 +615,7 @@ protected: private: OPropertySetHelper( const OPropertySetHelper & ) SAL_THROW( () ); - OPropertySetHelper & operator = ( const OPropertySetHelper & ) SAL_THROW( () ); + OPropertySetHelper & operator = ( const OPropertySetHelper & ) SAL_THROW( () ); public: // Suppress warning about virtual functions but non-virtual destructor: @@ -635,7 +635,7 @@ public: #endif } // end namespace cppuhelper -#endif // +#endif // diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.h b/cppuhelper/inc/cppuhelper/proptypehlp.h index e36e9d897dee..a7c1210319d6 100644 --- a/cppuhelper/inc/cppuhelper/proptypehlp.h +++ b/cppuhelper/inc/cppuhelper/proptypehlp.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 @@ namespace cppu { The function does the same as the operator >>= () at the Any class, except that it throws an IllegalArgumentException in case of failures (the value cannot be extracted without data loss ) - + @exception com::sun::star::lang::IllegalArgumentException when the type could not be converted. */ template < class target > @@ -50,25 +50,25 @@ inline void SAL_CALL convertPropertyValue( target &value , ::com::sun::star::un /** conversion of basic types */ -inline void SAL_CALL convertPropertyValue( sal_Int64 & target , const ::com::sun::star::uno::Any & source ) +inline void SAL_CALL convertPropertyValue( sal_Int64 & target , const ::com::sun::star::uno::Any & source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); -inline void SAL_CALL convertPropertyValue( sal_uInt64 & target, const ::com::sun::star::uno::Any & source ) +inline void SAL_CALL convertPropertyValue( sal_uInt64 & target, const ::com::sun::star::uno::Any & source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); -inline void SAL_CALL convertPropertyValue( sal_Int32 & target , const ::com::sun::star::uno::Any & source ) +inline void SAL_CALL convertPropertyValue( sal_Int32 & target , const ::com::sun::star::uno::Any & source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); -inline void SAL_CALL convertPropertyValue( sal_uInt32 & target, const ::com::sun::star::uno::Any & source ) +inline void SAL_CALL convertPropertyValue( sal_uInt32 & target, const ::com::sun::star::uno::Any & source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); inline void SAL_CALL convertPropertyValue( sal_Int16 & target , const ::com::sun::star::uno::Any & source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); inline void SAL_CALL convertPropertyValue( sal_uInt16 & target, const ::com::sun::star::uno::Any & source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); -inline void SAL_CALL convertPropertyValue( sal_Int8 & target , const ::com::sun::star::uno::Any & source ) +inline void SAL_CALL convertPropertyValue( sal_Int8 & target , const ::com::sun::star::uno::Any & source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); inline void SAL_CALL convertPropertyValue( float & target , const ::com::sun::star::uno::Any & source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); inline void SAL_CALL convertPropertyValue( double &target , const ::com::sun::star::uno::Any &source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); -inline void SAL_CALL convertPropertyValue( ::rtl::OUString &target , const ::com::sun::star::uno::Any &source ) +inline void SAL_CALL convertPropertyValue( ::rtl::OUString &target , const ::com::sun::star::uno::Any &source ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ); } // end namespace cppu diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.hxx b/cppuhelper/inc/cppuhelper/proptypehlp.hxx index b1c50389dc83..b7a14e8bcbae 100644 --- a/cppuhelper/inc/cppuhelper/proptypehlp.hxx +++ b/cppuhelper/inc/cppuhelper/proptypehlp.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 @@ -31,13 +31,13 @@ #include <cppuhelper/proptypehlp.h> namespace cppu -{ +{ /** Converts the value stored in an any to a concrete C++ type. The function does the same as the operator >>= () at the Any class, except that it throws an IllegalArgumentException in case of failures (the value cannot be extracted without data loss ) - + @exception com::sun::star::lang::IllegalArgumentException when the type could not be converted. */ template < class target > @@ -45,7 +45,7 @@ inline void SAL_CALL convertPropertyValue( target &value , const ::com::sun::st { if( !( a >>= value ) ) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } @@ -72,12 +72,12 @@ inline void SAL_CALL convertPropertyValue( sal_Bool & b , const ::com::sun::st } else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c = *(sal_Unicode*) a.getValue(); - b = ( sal_Bool ) c; + b = ( sal_Bool ) c; } else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; - b = ( sal_Bool ) i16; + b = ( sal_Bool ) i16; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { b = *((sal_Bool*)a.getValue()); @@ -85,12 +85,12 @@ inline void SAL_CALL convertPropertyValue( sal_Bool & b , const ::com::sun::st else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; - b = ( sal_Bool ) i8; + b = ( sal_Bool ) i8; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; - b = ( sal_Bool ) i16; + b = ( sal_Bool ) i16; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32 = 0; @@ -98,17 +98,17 @@ inline void SAL_CALL convertPropertyValue( sal_Bool & b , const ::com::sun::st b = ( sal_Bool ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); - } + throw ::com::sun::star::lang::IllegalArgumentException(); + } } -inline void SAL_CALL convertPropertyValue( sal_Int64 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_Int64 & i , const ::com::sun::star::uno::Any & a ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ) { const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); - + if( ::com::sun::star::uno::TypeClass_HYPER == tc ) { - a >>= i; + a >>= i; } else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { sal_uInt64 i64 = 0; @@ -123,27 +123,27 @@ inline void SAL_CALL convertPropertyValue( sal_Int64 & i , const ::com::sun::st else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *(sal_Unicode *)a.getValue(); - i = ( sal_Int64 ) c; + i = ( sal_Int64 ) c; } else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; - i = ( sal_Int64 ) i16; + i = ( sal_Int64 ) i16; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - i = ( sal_Int64 ) b; + i = ( sal_Int64 ) b; } else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; - i = ( sal_Int64 ) i8; + i = ( sal_Int64 ) i8; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; - i = ( sal_Int64 ) i16; + i = ( sal_Int64 ) i16; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32 = 0; @@ -151,18 +151,18 @@ inline void SAL_CALL convertPropertyValue( sal_Int64 & i , const ::com::sun::st i = ( sal_Int64 ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( sal_uInt64 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_uInt64 & i , const ::com::sun::star::uno::Any & a ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ) { const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); - + if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { - a >>= i; + a >>= i; } if( ::com::sun::star::uno::TypeClass_HYPER == tc ) { sal_Int64 i64; @@ -177,27 +177,27 @@ inline void SAL_CALL convertPropertyValue( sal_uInt64 & i , const ::com::sun::s else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *( sal_Unicode * ) a.getValue() ; - i = ( sal_uInt64 ) c; + i = ( sal_uInt64 ) c; } else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { sal_Int16 i16; a >>= i16; - i = ( sal_uInt64 ) i16; + i = ( sal_uInt64 ) i16; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - i = ( sal_uInt64 ) b; + i = ( sal_uInt64 ) b; } else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8; a >>= i8; - i = ( sal_uInt64 ) i8; + i = ( sal_uInt64 ) i8; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16; a >>= i16; - i = ( sal_uInt64 ) i16; + i = ( sal_uInt64 ) i16; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32; @@ -205,44 +205,44 @@ inline void SAL_CALL convertPropertyValue( sal_uInt64 & i , const ::com::sun::s i = ( sal_uInt64 ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } // the basic types // sal_Int32 -inline void SAL_CALL convertPropertyValue( sal_Int32 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_Int32 & i , const ::com::sun::star::uno::Any & a ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ) { const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); - + if( ::com::sun::star::uno::TypeClass_LONG == tc ) { a >>= i; } else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *(sal_Unicode*) a.getValue(); - i = ( sal_Int32 ) c; + i = ( sal_Int32 ) c; } else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; - i = ( sal_Int32 ) i16; + i = ( sal_Int32 ) i16; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - i = ( sal_Int32 ) b; + i = ( sal_Int32 ) b; } else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; - i = ( sal_Int32 ) i8; + i = ( sal_Int32 ) i8; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; - i = ( sal_Int32 ) i16; + i = ( sal_Int32 ) i16; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32 = 0; @@ -250,15 +250,15 @@ inline void SAL_CALL convertPropertyValue( sal_Int32 & i , const ::com::sun::st i = ( sal_Int32 ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( sal_uInt32 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_uInt32 & i , const ::com::sun::star::uno::Any & a ) SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ) { const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); - + if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { a >>= i; } @@ -270,30 +270,30 @@ inline void SAL_CALL convertPropertyValue( sal_uInt32 & i , const ::com::sun::s else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *(sal_Unicode*) a.getValue(); - i = ( sal_uInt32 ) c; + i = ( sal_uInt32 ) c; } else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { sal_Int16 i16; a >>= i16; - i = ( sal_uInt32 ) i16; + i = ( sal_uInt32 ) i16; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - i = ( sal_uInt32 ) b; + i = ( sal_uInt32 ) b; } else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8; a >>= i8; - i = ( sal_uInt32 ) i8; + i = ( sal_uInt32 ) i8; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16; a >>= i16; - i = ( sal_uInt32 ) i16; + i = ( sal_uInt32 ) i16; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } @@ -309,25 +309,25 @@ inline void SAL_CALL convertPropertyValue( sal_Int16 & i , const ::com::sun::st else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *(sal_Unicode*) a.getValue(); - i = ( sal_Int16 ) c; + i = ( sal_Int16 ) c; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - i = ( sal_Int16 ) b; + i = ( sal_Int16 ) b; } else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; - i = ( sal_Int16 ) i8; + i = ( sal_Int16 ) i8; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; - i = ( sal_Int16 ) i16; + i = ( sal_Int16 ) i16; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } @@ -342,17 +342,17 @@ inline void SAL_CALL convertPropertyValue( sal_uInt16 & i , const ::com::sun::s else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *(sal_Unicode *) a.getValue(); - i = ( sal_Int16 ) c; + i = ( sal_Int16 ) c; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - i = ( sal_Int16 ) b; + i = ( sal_Int16 ) b; } else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; - i = ( sal_Int16 ) i8; + i = ( sal_Int16 ) i8; } else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; @@ -360,7 +360,7 @@ inline void SAL_CALL convertPropertyValue( sal_uInt16 & i , const ::com::sun::s i = ( sal_Int16 ) i16; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } @@ -375,10 +375,10 @@ inline void SAL_CALL convertPropertyValue( sal_Int8 & i , const ::com::sun::sta else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - i = ( sal_Int8 ) b; + i = ( sal_Int8 ) b; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } @@ -386,9 +386,9 @@ inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::un SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ) { const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); - + if ( ::com::sun::star::uno::TypeClass_FLOAT == tc ) { - a >>= f; + a >>= f; } else if( ::com::sun::star::uno::TypeClass_DOUBLE == tc ) { double d = 0; @@ -397,16 +397,16 @@ inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::un } else if( ::com::sun::star::uno::TypeClass_HYPER == tc ) { sal_Int64 i64 = 0; - a >>= i64; + a >>= i64; f = ( float ) i64; } // msci 4 does not support this conversion -/* else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { +/* else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { sal_uInt64 i64; a >>= i64; f = ( float ) i64; } -*/ else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { +*/ else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { sal_Int32 i32 = 0; a >>= i32; f = ( float )i32; @@ -414,27 +414,27 @@ inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::un else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *(sal_Unicode*) a.getValue(); - f = ( float ) c; + f = ( float ) c; } else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; - f = ( float ) i16; + f = ( float ) i16; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - f = ( float ) b; + f = ( float ) b; } else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; - f = ( float ) i8; + f = ( float ) i8; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; - f = ( float ) i16; + f = ( float ) i16; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32 = 0; @@ -442,7 +442,7 @@ inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::un f = ( float ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } @@ -451,7 +451,7 @@ inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::u SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ) { const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); - + if( ::com::sun::star::uno::TypeClass_DOUBLE == tc ) { float f; a >>= f; @@ -464,16 +464,16 @@ inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::u } else if( ::com::sun::star::uno::TypeClass_HYPER == tc ) { sal_Int64 i64; - a >>= i64; + a >>= i64; d = (double) i64; } - // msci 4 does not support this -/* else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { + // msci 4 does not support this +/* else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { sal_uInt64 i64; a >>= i64; d = (double) i64; } -*/ else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { +*/ else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { sal_Int32 i32; a >>= i32; d = (double)i32; @@ -481,22 +481,22 @@ inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::u else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *(sal_Unicode*) a.getValue(); - d = (double) c; + d = (double) c; } else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { sal_Int16 i16; a >>= i16; - d = (double) i16; + d = (double) i16; } else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { sal_Bool b; b = *((sal_Bool * )a.getValue()); - d = (double) b; + d = (double) b; } else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { sal_Int8 i8; a >>= i8; - d = (double) i8; + d = (double) i8; } else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16; @@ -509,7 +509,7 @@ inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::u d = (double) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw ::com::sun::star::lang::IllegalArgumentException(); } } @@ -517,7 +517,7 @@ inline void SAL_CALL convertPropertyValue( ::rtl::OUString &ow , const ::com::su SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) ) { if( ::com::sun::star::uno::TypeClass_STRING == a.getValueType().getTypeClass() ) { - a >>= ow; + a >>= ow; } else { throw ::com::sun::star::lang::IllegalArgumentException(); diff --git a/cppuhelper/inc/cppuhelper/queryinterface.hxx b/cppuhelper/inc/cppuhelper/queryinterface.hxx index e67e9f9b9342..4efc77ae88a9 100644 --- a/cppuhelper/inc/cppuhelper/queryinterface.hxx +++ b/cppuhelper/inc/cppuhelper/queryinterface.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,7 +35,7 @@ #include "sal/types.h" namespace cppu -{ +{ /** Compares demanded type to given template argument types. @@ -56,7 +56,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @param rType demanded type @@ -78,7 +78,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -104,7 +104,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -134,7 +134,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -168,7 +168,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -208,7 +208,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -252,7 +252,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -300,7 +300,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -352,7 +352,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -408,7 +408,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type @@ -470,7 +470,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( return ::com::sun::star::uno::Any(); } /** Compares demanded type to given template argument types. - + @tplparam Interface1 interface type @tplparam Interface2 interface type @tplparam Interface3 interface type diff --git a/cppuhelper/inc/cppuhelper/servicefactory.hxx b/cppuhelper/inc/cppuhelper/servicefactory.hxx index 366b7dd35e06..bdf9f9e6bce7 100644 --- a/cppuhelper/inc/cppuhelper/servicefactory.hxx +++ b/cppuhelper/inc/cppuhelper/servicefactory.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 @@ -38,22 +38,22 @@ namespace cppu { /** Deprecated. Use cppuhelper/bootstrap.hxx functions instead. - - This bootstraps an initial service factory working on a registry. If the first or both + + This bootstraps an initial service factory working on a registry. If the first or both parameters contain a value then the service factory is initialized with a simple registry or a nested registry. Otherwise the service factory must be initialized later with a valid registry. - + @param rWriteRegistryFile file name of the simple registry or the first registry file of the nested registry which will be opened with read/write rights. This file will be created if necessary. @param rReadRegistryFile - file name of the second registry file of the nested registry + file name of the second registry file of the nested registry which will be opened with readonly rights. @param bReadOnly - flag which specify that the first registry file will be opened with - readonly rights. Default is FALSE. If this flag is used the registry + flag which specify that the first registry file will be opened with + readonly rights. Default is FALSE. If this flag is used the registry will not be created if not exist. @param rBootstrapPath specifies a path where the bootstrap components could be find. If this @@ -63,7 +63,7 @@ namespace cppu */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL createRegistryServiceFactory( - const ::rtl::OUString & rWriteRegistryFile, + const ::rtl::OUString & rWriteRegistryFile, const ::rtl::OUString & rReadRegistryFile, sal_Bool bReadOnly = sal_False, const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) @@ -71,15 +71,15 @@ createRegistryServiceFactory( /** Deprecated. Use cppuhelper/bootstrap.hxx functions instead. - + This bootstraps an initial service factory working on a registry file. - + @param rRegistryFile file name of the registry to use/ create; if this is an empty string, the default registry is used instead @param bReadOnly - flag which specify that the registry file will be opened with - readonly rights. Default is FALSE. If this flag is used the registry + flag which specify that the registry file will be opened with + readonly rights. Default is FALSE. If this flag is used the registry will not be created if not exist. @param rBootstrapPath specifies a path where the bootstrap components could be find. If this @@ -89,7 +89,7 @@ createRegistryServiceFactory( */ inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL createRegistryServiceFactory( - const ::rtl::OUString & rRegistryFile, + const ::rtl::OUString & rRegistryFile, sal_Bool bReadOnly = sal_False, const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) SAL_THROW( (::com::sun::star::uno::Exception) ) @@ -99,7 +99,7 @@ createRegistryServiceFactory( } /** Deprecated. Use cppuhelper/bootstrap.hxx functions instead. - + This bootstraps a service factory without initialize a registry. @param rBootstrapPath diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/cppuhelper/inc/cppuhelper/shlib.hxx index 4d19171db096..a4f52ca94eb5 100644 --- a/cppuhelper/inc/cppuhelper/shlib.hxx +++ b/cppuhelper/inc/cppuhelper/shlib.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,7 +42,7 @@ namespace cppu (e.g. xxx.dll). You can give parameter rPath to force lookup of the library in a specific directory. The resulting path of the library will be checked against environment variable CPLD_ACCESSPATH if set. - + @param rLibName name of the library @param rPath optional path @param rImplName implementation to be retrieved from the library @@ -65,7 +65,7 @@ SAL_CALL loadSharedLibComponentFactory( (e.g. xxx.dll). You can give parameter rPath to force lookup of the library in a specific directory. The resulting path of the library will be checked against environment variable CPLD_ACCESSPATH if set. - + @param rLibName name of the library @param rPath optional path @param xMgr service manager to be provided to the component diff --git a/cppuhelper/inc/cppuhelper/stdidlclass.hxx b/cppuhelper/inc/cppuhelper/stdidlclass.hxx index e7c8443ef0f3..576378b104b7 100644 --- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx +++ b/cppuhelper/inc/cppuhelper/stdidlclass.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 @@ -38,12 +38,12 @@ namespace cppu { @deprecated */ ::com::sun::star::reflection::XIdlClass * SAL_CALL createStandardClassWithSequence( - const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr , - const ::rtl::OUString & sImplementationName , + const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr , + const ::rtl::OUString & sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & rSuperClass, const ::com::sun::star::uno::Sequence < ::rtl::OUString > &seq ) SAL_THROW( () ); - + /** @@ -58,47 +58,47 @@ namespace cppu { @deprecated */ -template < class Interface1 > +template < class Interface1 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(1); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } -template < class Interface1, class Interface2 > +template < class Interface1, class Interface2 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, const Interface2 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(2); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } @@ -106,10 +106,10 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta -template < class Interface1, class Interface2 , class Interface3 > +template < class Interface1, class Interface2 , class Interface3 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, @@ -117,16 +117,16 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta const Interface3 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(3); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } @@ -134,10 +134,10 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta -template < class Interface1, class Interface2 , class Interface3 , class Interface4 > +template < class Interface1, class Interface2 , class Interface3 , class Interface4 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, @@ -146,17 +146,17 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta const Interface4 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(4); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } @@ -166,10 +166,10 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta -template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 > +template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, @@ -179,29 +179,29 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta const Interface5 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(5); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } -template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 , - class Interface6 > +template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 , + class Interface6 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, @@ -212,7 +212,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta const Interface6 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(6); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); @@ -220,11 +220,11 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); seqInterface.getArray()[5] = Interface6::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } @@ -232,11 +232,11 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta -template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 , - class Interface6, class Interface7 > +template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 , + class Interface6, class Interface7 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, @@ -245,10 +245,10 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta const Interface4 *, const Interface5 *, const Interface6 *, - const Interface7 * + const Interface7 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(7); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); @@ -257,11 +257,11 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); seqInterface.getArray()[5] = Interface6::static_type().getTypeName(); seqInterface.getArray()[6] = Interface7::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } @@ -270,11 +270,11 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta -template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , - class Interface6, class Interface7, class Interface8 > +template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , + class Interface6, class Interface7, class Interface8 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, @@ -287,7 +287,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta const Interface8 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(8); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); @@ -297,22 +297,22 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta seqInterface.getArray()[5] = Interface6::static_type().getTypeName(); seqInterface.getArray()[6] = Interface7::static_type().getTypeName(); seqInterface.getArray()[7] = Interface8::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } -template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , - class Interface6, class Interface7, class Interface8 , class Interface9 > +template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , + class Interface6, class Interface7, class Interface8 , class Interface9 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, @@ -326,7 +326,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta const Interface9 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(9); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); @@ -337,20 +337,20 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta seqInterface.getArray()[6] = Interface7::static_type().getTypeName(); seqInterface.getArray()[7] = Interface8::static_type().getTypeName(); seqInterface.getArray()[8] = Interface9::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } -template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , - class Interface6, class Interface7, class Interface8 , class Interface9 , class Interface10 > +template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , + class Interface6, class Interface7, class Interface8 , class Interface9 , class Interface10 > inline ::com::sun::star::reflection::XIdlClass * SAL_CALL //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, +createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr, const ::rtl::OUString &sImplementationName , const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass , const Interface1 *, @@ -365,7 +365,7 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta const Interface10 * ) SAL_THROW( () ) -{ +{ ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(10); seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); @@ -377,11 +377,11 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta seqInterface.getArray()[7] = Interface8::static_type().getTypeName(); seqInterface.getArray()[8] = Interface9::static_type().getTypeName(); seqInterface.getArray()[9] = Interface10::static_type().getTypeName(); - return createStandardClassWithSequence( + return createStandardClassWithSequence( rSMgr, sImplementationName, rSuperClass, - seqInterface + seqInterface ); } diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/cppuhelper/inc/cppuhelper/typeprovider.hxx index c434d54a7071..4e01bb5ac80a 100644 --- a/cppuhelper/inc/cppuhelper/typeprovider.hxx +++ b/cppuhelper/inc/cppuhelper/typeprovider.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,7 +42,7 @@ namespace cppu class OTypeCollection { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _aTypes; - + public: // these are here to force memory de/allocation to sal lib. /** @internal */ @@ -194,7 +194,7 @@ class OImplementationId mutable ::com::sun::star::uno::Sequence< sal_Int8 > * _pSeq; /** @internal */ sal_Bool _bUseEthernetAddress; - + public: // these are here to force memory de/allocation to sal lib. /** @internal */ @@ -209,7 +209,7 @@ public: /** @internal */ inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) {} - + /** @internal */ ~OImplementationId() SAL_THROW( () ); /** Constructor. @@ -230,9 +230,9 @@ public: inline OImplementationId( const OImplementationId & rId ) SAL_THROW( () ) : _pSeq( new ::com::sun::star::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) ) {} - + /** Called upon XTypeProvider::getImplementationId(). - + @return implementation id */ ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() const SAL_THROW( () ); diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx index c0d70dee8e9b..55127ed84134 100644 --- a/cppuhelper/inc/cppuhelper/unourl.hxx +++ b/cppuhelper/inc/cppuhelper/unourl.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/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx index 14236d992310..2000557ea079 100644 --- a/cppuhelper/inc/cppuhelper/weak.hxx +++ b/cppuhelper/inc/cppuhelper/weak.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,7 +36,7 @@ namespace cppu -{ +{ /** @internal */ class OWeakConnectionPoint; @@ -45,7 +45,7 @@ class OWeakConnectionPoint; weakly (by a ::com::sun::star::uno::WeakReference). This implementation copes with reference counting. Upon last release(), the virtual dtor is called. - + @derive Inherit from this class and delegate acquire()/ release() calls. */ @@ -53,39 +53,39 @@ class OWeakObject : public ::com::sun::star::uno::XWeak { /** @internal */ friend class OWeakConnectionPoint; - + protected: /** Virtual dtor. - + @attention Despite the fact that a RuntimeException is allowed to be thrown, you must not throw any exception upon destruction! */ virtual ~OWeakObject() SAL_THROW( (::com::sun::star::uno::RuntimeException) ); - + /** disposes and resets m_pWeakConnectionPoint @precond m_refCount equals 0 */ void disposeWeakConnectionPoint(); - + /** reference count. - + @attention Don't modify manually! Use acquire() and release(). */ oslInterlockedCount m_refCount; - + /** Container of all weak reference listeners and the connection point from the weak reference. @internal */ OWeakConnectionPoint * m_pWeakConnectionPoint; - + /** reserved for future use. do not use. @internal */ void * m_pReserved; - + public: // these are here to force memory de/allocation to sal lib. /** @internal */ @@ -100,7 +100,7 @@ public: /** @internal */ inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () ) {} - + #ifdef _MSC_VER /** Default Constructor. Sets the reference count to zero. Accidentally occurs in msvc mapfile = > had to be outlined. @@ -115,7 +115,7 @@ public: {} #endif /** Dummy copy constructor. Set the reference count to zero. - + @param rObj dummy param */ inline OWeakObject( const OWeakObject & ) SAL_THROW( () ) @@ -124,16 +124,16 @@ public: , m_pWeakConnectionPoint( 0 ) {} /** Dummy assignment operator. Does not affect reference count. - + @return this OWeakObject */ inline OWeakObject & SAL_CALL operator = ( const OWeakObject &) SAL_THROW( () ) { return *this; } - + /** Basic queryInterface() implementation supporting ::com::sun::star::uno::XWeak and ::com::sun::star::uno::XInterface. - + @param rType demanded type @return demanded type or empty any */ @@ -148,16 +148,16 @@ public: */ virtual void SAL_CALL release() throw (); - + /** XWeak::queryAdapter() implementation @return a ::com::sun::star::uno::XAdapter reference */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter > SAL_CALL queryAdapter() throw (::com::sun::star::uno::RuntimeException); - + /** Cast operator to XInterface reference. - + @return XInterface reference */ inline SAL_CALL operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > () SAL_THROW( () ) diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx index adc3b7987d04..aac14997e5a7 100644 --- a/cppuhelper/inc/cppuhelper/weakagg.hxx +++ b/cppuhelper/inc/cppuhelper/weakagg.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,14 +33,14 @@ namespace cppu -{ +{ /** Base class to implement an UNO object supporting weak references, i.e. the object can be held weakly (by a ::com::sun::star::uno::WeakReference) and aggregation, i.e. the object can be aggregated by another (delegator). This implementation copes with reference counting. Upon last release(), the virtual dtor is called. - + @derive Inherit from this class and delegate acquire()/ release() calls. Re-implement XAggregation::queryInterface(). @@ -54,7 +54,7 @@ public: */ inline OWeakAggObject() SAL_THROW( () ) {} - + /** If a delegator is set, then the delegators gets acquired. Otherwise call is delegated to base class ::cppu::OWeakObject. */ @@ -66,7 +66,7 @@ public: /** If a delegator is set, then the delegator is queried for the demanded interface. If the delegator cannot provide the demanded interface, it calls queryAggregation() on its aggregated objects. - + @param rType demanded interface type @return demanded type or empty any @see queryAggregation. @@ -75,14 +75,14 @@ public: throw(::com::sun::star::uno::RuntimeException); /** Set the delegator. The delegator member reference is a weak reference. - + @param Delegator the object that delegate its queryInterface to this aggregate. */ virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Delegator ) throw(::com::sun::star::uno::RuntimeException); /** Called by the delegator or queryInterface. Re-implement this method instead of queryInterface. - + @see queryInterface */ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) @@ -96,7 +96,7 @@ protected: exception upon destruction! */ virtual ~OWeakAggObject() SAL_THROW( (::com::sun::star::uno::RuntimeException) ); - + /** weak reference to delegator. */ ::com::sun::star::uno::WeakReferenceHelper xDelegator; diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx index f138a8aeaf10..54a313b2d5df 100644 --- a/cppuhelper/inc/cppuhelper/weakref.hxx +++ b/cppuhelper/inc/cppuhelper/weakref.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,13 +32,13 @@ namespace com -{ +{ namespace sun -{ +{ namespace star -{ +{ namespace uno -{ +{ /** @internal */ class OWeakRefListener; @@ -53,8 +53,8 @@ public: */ inline WeakReferenceHelper() SAL_THROW( () ) : m_pImpl( 0 ) - {} - + {} + /** Copy ctor. Initialize this reference with the same interface as in rWeakRef. @param rWeakRef another weak ref @@ -62,7 +62,7 @@ public: WeakReferenceHelper( const WeakReferenceHelper & rWeakRef ) SAL_THROW( () ); /** Initialize this reference with the hard interface reference xInt. If the implementation behind xInt does not support XWeak or XInt is null then this reference will be null. - + @param xInt another hard interface reference */ WeakReferenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xInt ) @@ -70,9 +70,9 @@ public: /** Releases this reference. */ ~WeakReferenceHelper() SAL_THROW( () ); - + /** Releases this reference and takes over rWeakRef. - + @param rWeakRef another weak ref */ WeakReferenceHelper & SAL_CALL operator = ( const WeakReferenceHelper & rWeakRef ) SAL_THROW( () ); @@ -94,14 +94,14 @@ public: */ inline sal_Bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const SAL_THROW( () ) { return (get() == rObj.get()); } - + /** Gets a hard reference to the object. - + @return hard reference or null, if the weakly referenced interface has gone */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL get() const SAL_THROW( () ); /** Gets a hard reference to the object. - + @return hard reference or null, if the weakly referenced interface has gone */ inline SAL_CALL operator Reference< XInterface > () const SAL_THROW( () ) @@ -125,16 +125,16 @@ protected: */ template< class interface_type > class WeakReference : public WeakReferenceHelper -{ +{ public: /** Default ctor. Creates an empty weak reference. */ inline WeakReference() SAL_THROW( () ) : WeakReferenceHelper() {} - + /** Copy ctor. Initialize this reference with a hard reference. - + @param rRef another hard ref */ inline WeakReference( const Reference< interface_type > & rRef ) SAL_THROW( () ) @@ -155,7 +155,7 @@ public: { WeakReferenceHelper::operator=(xInt); return *this; } /** Gets a hard reference to the object. - + @return hard reference or null, if the weakly referenced interface has gone */ inline SAL_CALL operator Reference< interface_type > () const SAL_THROW( () ) diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.cxx b/cppuhelper/inc/pch/precompiled_cppuhelper.cxx index 28a0019ac80e..d8090977e1ff 100644 --- a/cppuhelper/inc/pch/precompiled_cppuhelper.cxx +++ b/cppuhelper/inc/pch/precompiled_cppuhelper.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/cppuhelper/inc/pch/precompiled_cppuhelper.hxx b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx index 9a601079de5b..b1a1df1a14f3 100644 --- a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx +++ b/cppuhelper/inc/pch/precompiled_cppuhelper.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 |