diff options
Diffstat (limited to 'cppuhelper')
110 files changed, 1266 insertions, 1266 deletions
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx index acd5008b83de..7b177c9e8ea4 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 0b94deda0174..f145709095fb 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 76a0c32a4905..253d3fa53b40 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 54db23a4e5d3..5827c630da23 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 0f146f4eafc9..b968c3278eb1 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 9c3fd193af1f..0dd725b35a16 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 efb9a9f6b321..5b88983ac6fd 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 8a43f50098a1..f79af5223571 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 c102f9726367..9518c01f85fd 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 9e8c18e754a2..04bac81f9e2a 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 8f7bb7634fdb..a482e4bf0be7 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 dfdbe976eff8..2fdaf471aa73 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 c871e06e3fb7..3c80d59169fe 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 42c3c040ccff..43d4de7d787a 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 3742753e1986..8df9b4fb5eff 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 7ca131ae2be9..a2f90b45dae6 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 7d79304b2f2f..121927b3320c 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 92eb60389afb..76f74d402ab5 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 2ab6a0cf25cf..10ecc2a885c4 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 3d70b9eb6a4d..5b07c05d9edc 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 538d85c51e85..0ba8c603a8ed 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 8a7027ebf906..b1bbc50e3340 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 9d56d4c5f51b..fe816ed18acf 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 c7de4ad26e0b..6974c4c57507 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 26ea7525732d..972de4544fe9 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 c262cd6ae5b0..49a1149b68fa 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 a4ef396c0bd6..0005abf07f3d 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 8aa6fb4ceeda..99282f6a0a16 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 e3cca581febd..1aad6ce7b940 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 c982fca2a9ca..ad00b829ee88 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 c2eff30c0df1..8d4e216e0b00 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 ca11813140aa..c545284145e6 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 620e0e0a583c..9a254f40f731 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 31bda399bc61..e817dc388e8a 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 911caac08ae6..a070c71cab3e 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 056bb3760f8a..267bdf6b04cc 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 3a2f4ca4ad6c..83849e5e6cab 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 7eee744cd4c0..337fa1ecdc9a 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 eb49075d1350..1ff7e49676b7 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 6242de88b6d8..ae3c2adf1457 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 68781c9d5ac1..d9c347ecc0cf 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 41a9f1ae4785..6ab242f111a0 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 0beca5ab0bad..a288feb284ba 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 a7c1210319d6..e36e9d897dee 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 b7a14e8bcbae..b1c50389dc83 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 4efc77ae88a9..e67e9f9b9342 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 bdf9f9e6bce7..366b7dd35e06 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 a4f52ca94eb5..4d19171db096 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 576378b104b7..e7c8443ef0f3 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::star:: -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::star:: 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::star:: -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::star:: 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::star:: -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::star:: 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::star:: 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::star:: 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::star:: -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::star:: 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::star:: 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::star:: -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::star:: 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::star:: 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::star:: 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::star:: 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::star:: 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::star:: 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 4e01bb5ac80a..c434d54a7071 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 55127ed84134..c0d70dee8e9b 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 2000557ea079..14236d992310 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 aac14997e5a7..adc3b7987d04 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 54a313b2d5df..f138a8aeaf10 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 d8090977e1ff..28a0019ac80e 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 b1a1df1a14f3..9a601079de5b 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 diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index 4f47fd449a87..8c76af380d3c 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.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/qa/propertysetmixin/JavaSupplier.java b/cppuhelper/qa/propertysetmixin/JavaSupplier.java index 513f207aba14..2d37c8901077 100644 --- a/cppuhelper/qa/propertysetmixin/JavaSupplier.java +++ b/cppuhelper/qa/propertysetmixin/JavaSupplier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx index adf161083398..4769904687b1 100644 --- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.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 @@ -411,7 +411,7 @@ css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { cppu::ImplementationEntry entries[] = { { &create, &getImplementationName, &getSupportedServiceNames, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, 0, 0 }, { 0, 0, 0, 0, 0, 0 } }; } diff --git a/cppuhelper/qa/propertysetmixin/test.map b/cppuhelper/qa/propertysetmixin/test.map index 0dbbcc5a7372..3308588ef6f8 100644 --- a/cppuhelper/qa/propertysetmixin/test.map +++ b/cppuhelper/qa/propertysetmixin/test.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 3b05dc3f3eb2..eea2e0f6cc2b 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.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/qa/propertysetmixin/types.idl b/cppuhelper/qa/propertysetmixin/types.idl index cd8659362367..09232648a8f0 100644 --- a/cppuhelper/qa/propertysetmixin/types.idl +++ b/cppuhelper/qa/propertysetmixin/types.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx index c37d08a28a24..c7d2de6dbb99 100644 --- a/cppuhelper/qa/unourl/cppu_unourl.cxx +++ b/cppuhelper/qa/unourl/cppu_unourl.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/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx index 9e0040b55666..eb93659e1e64 100644 --- a/cppuhelper/qa/weak/test_weak.cxx +++ b/cppuhelper/qa/weak/test_weak.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/qa/weak/version.map b/cppuhelper/qa/weak/version.map index f313c44bd7ad..7321bbca16ad 100644 --- a/cppuhelper/qa/weak/version.map +++ b/cppuhelper/qa/weak/version.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx index f71e6b217726..b3c8e0c0b16d 100644 --- a/cppuhelper/source/access_control.cxx +++ b/cppuhelper/source/access_control.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 @@ -46,9 +46,9 @@ using namespace ::com::sun::star::uno; namespace { - inline OUString str_ac_singleton() - { - return OUSTR("/singletons/com.sun.star.security.theAccessController"); + inline OUString str_ac_singleton() + { + return OUSTR("/singletons/com.sun.star.security.theAccessController"); } } @@ -110,11 +110,11 @@ inline void __checkPermission( __permission perm; perm.m_str1 = str1; perm.m_str2 = str2; - + uno_Any a; a.pType = type.getTypeLibType(); a.pData = &perm; - + xController->checkPermission( * static_cast< Any * >( &a ) ); } //__________________________________________________________________________________________________ diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 1a73a1d4d4fe..245714827145 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.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 @@ -135,7 +135,7 @@ void addFactories( { OUString lib( OUString::createFromAscii( *ppNames++ ) ); OUString implName( OUString::createFromAscii( *ppNames++ ) ); - + Any aFac( makeAny( loadSharedLibComponentFactory( lib, bootstrapPath, implName, xSF, xKey ) ) ); xSet->insert( aFac ); @@ -239,7 +239,7 @@ OUString findBoostrapArgument( result_buf.append( arg_name.toAsciiLowerCase() ); result_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(".rdb") ); result = result_buf.makeStringAndClear(); - + #if OSL_DEBUG_LEVEL > 1 OString result_dbg = OUStringToOString(result, RTL_TEXTENCODING_ASCII_US); @@ -323,7 +323,7 @@ Reference< registry::XSimpleRegistry > nestRegistries( bool optional = ('?' == rdb_name[ 0 ]); if (optional) rdb_name = rdb_name.copy( 1 ); - + try { Reference<registry::XSimpleRegistry> simpleRegistry( @@ -411,18 +411,18 @@ SAL_CALL defaultBootstrap_InitialComponentContext( sal_Bool bFallenback_types; OUString cls_uno_types = findBoostrapArgument( bootstrap, OUSTR("TYPES"), &bFallenback_types ); - + Reference<registry::XSimpleRegistry> types_xRegistry = nestRegistries( iniDir, xSimRegFac, xNesRegFac, cls_uno_types, OUString(), sal_False, bFallenback_types ); - + // ==== bootstrap from services registry ==== - + sal_Bool bFallenback_services; OUString cls_uno_services = findBoostrapArgument( bootstrap, OUSTR("SERVICES"), &bFallenback_services ); - + sal_Bool fallenBackWriteRegistry; OUString write_rdb = findBoostrapArgument( bootstrap, OUSTR("WRITERDB"), &fallenBackWriteRegistry ); @@ -431,16 +431,16 @@ SAL_CALL defaultBootstrap_InitialComponentContext( // no standard write rdb anymore write_rdb = OUString(); } - + Reference<registry::XSimpleRegistry> services_xRegistry = nestRegistries( iniDir, xSimRegFac, xNesRegFac, cls_uno_services, write_rdb, !fallenBackWriteRegistry, bFallenback_services ); - + Reference< XComponentContext > xContext( bootstrapInitialContext( smgr_XMultiComponentFactory, types_xRegistry, services_xRegistry, bootstrapPath, bootstrap ) ); - + // initialize sf Reference< lang::XInitialization > xInit( smgr_XMultiComponentFactory, UNO_QUERY ); @@ -448,7 +448,7 @@ SAL_CALL defaultBootstrap_InitialComponentContext( Sequence< Any > aSFInit( 1 ); aSFInit[ 0 ] <<= services_xRegistry; xInit->initialize( aSFInit ); - + return xContext; } @@ -497,8 +497,8 @@ BootstrapException & BootstrapException::operator=( const BootstrapException & e } const ::rtl::OUString & BootstrapException::getMessage() const -{ - return m_aMessage; +{ + return m_aMessage; } Reference< XComponentContext > SAL_CALL bootstrap() @@ -541,7 +541,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() } // create default local component context - Reference< XComponentContext > xLocalContext( + Reference< XComponentContext > xLocalContext( defaultBootstrap_InitialComponentContext() ); if ( !xLocalContext.is() ) throw BootstrapException( OUSTR( "no local component context!" ) ); @@ -551,7 +551,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() if ( hPool == 0 ) throw BootstrapException( OUSTR( "cannot create random pool!" ) ); sal_uInt8 bytes[ 16 ]; - if ( rtl_random_getBytes( hPool, bytes, ARLEN( bytes ) ) + if ( rtl_random_getBytes( hPool, bytes, ARLEN( bytes ) ) != rtl_Random_E_None ) throw BootstrapException( OUSTR( "random pool error!" ) ); rtl_random_destroyPool( hPool ); @@ -621,7 +621,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() OSL_ASSERT( buf.getLength() == 0 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "uno:pipe,name=" ) ); buf.append( sPipeName ); - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ";urp;StarOffice.ComponentContext" ) ); OUString sConnectString( buf.makeStringAndClear() ); @@ -631,7 +631,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() try { // try to connect to office - xRemoteContext.set( + xRemoteContext.set( xUrlResolver->resolve( sConnectString ), UNO_QUERY_THROW ); break; } @@ -645,7 +645,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() } catch ( Exception & e ) { - throw BootstrapException( + throw BootstrapException( OUSTR( "unexpected UNO exception caught: " ) + e.Message ); } diff --git a/cppuhelper/source/cc5_solaris_sparc.map b/cppuhelper/source/cc5_solaris_sparc.map index 090f8a1cca2e..d43ea690e11a 100755 --- a/cppuhelper/source/cc5_solaris_sparc.map +++ b/cppuhelper/source/cc5_solaris_sparc.map @@ -326,7 +326,7 @@ UDK_3.1 { __1cEcppubL__RTTI__1CpnEcppuSBootstrapException__; __1cEcppubM__RTTI__1CpknEcppuSBootstrapException__; } UDK_3_0_0; - + UDK_3.2 { global: __1cEcppubL__RTTI__1nEcppuUPropertySetMixinImpl__; diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index 2add1357b5cf..13ee0d8f60f9 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.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 @@ -44,9 +44,9 @@ using namespace com::sun::star::lang; namespace cppu { -// ---------------------------------------------------- -// class OComponentHelper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class OComponentHelper +// ---------------------------------------------------- OComponentHelper::OComponentHelper( Mutex & rMutex ) SAL_THROW( () ) : rBHelper( rMutex ) diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 306490aa1616..de1d106912bd 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.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 @@ -152,7 +152,7 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p TYPELIB_DANGER_GET( &pElementTypeDescr, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType ); sal_Int32 nElementSize = pElementTypeDescr->nSize; - sal_Int32 nElements = pSequence->nElements; + sal_Int32 nElements = pSequence->nElements; if (nElements) { @@ -385,7 +385,7 @@ public: throw (RuntimeException); virtual Reference<lang::XMultiComponentFactory> SAL_CALL getServiceManager() throw (RuntimeException); - + // XNameContainer virtual void SAL_CALL insertByName( OUString const & name, Any const & element ) @@ -545,20 +545,20 @@ Any ComponentContext::lookupMap( OUString const & rName ) return Any(); } #endif - + ResettableMutexGuard guard( m_mutex ); t_map::const_iterator iFind( m_map.find( rName ) ); if (iFind == m_map.end()) return Any(); - + t_map::mapped_type pEntry = iFind->second; if (! pEntry->lateInit) return pEntry->value; - + // late init singleton entry Reference< XInterface > xInstance; guard.clear(); - + try { Any usesService( getValueByName( rName + OUSTR("/service") ) ); @@ -569,7 +569,7 @@ Any ComponentContext::lookupMap( OUString const & rName ) args.realloc( 1 ); args[ 0 ] = args_; } - + Reference< lang::XSingleComponentFactory > xFac; if (usesService >>= xFac) // try via factory { @@ -623,14 +623,14 @@ Any ComponentContext::lookupMap( OUString const & rName ) throw lang::WrappedTargetRuntimeException( buf.makeStringAndClear(), static_cast<OWeakObject *>(this),caught ); } - + if (! xInstance.is()) { throw RuntimeException( OUSTR("no service object raising singleton ") + rName, static_cast<OWeakObject *>(this) ); } - + Any ret; guard.reset(); iFind = m_map.find( rName ); @@ -645,7 +645,7 @@ Any ComponentContext::lookupMap( OUString const & rName ) } else ret = pEntry->value; - } + } guard.clear(); try_dispose( xInstance ); return ret; @@ -663,7 +663,7 @@ Any ComponentContext::getValueByName( OUString const & rName ) else return makeAny( Reference<XComponentContext>(this) ); } - + Any ret( lookupMap( rName ) ); if (!ret.hasValue() && m_xDelegate.is()) { @@ -883,7 +883,7 @@ Reference< XComponentContext > SAL_CALL createComponentContext( { mapped_entries[nPos].bLateInitService = pEntries[nPos].bLateInitService; mapped_entries[nPos].name = pEntries[nPos].name; - + uno_type_any_constructAndConvert(&mapped_entries[nPos].value, const_cast<void *>(pEntries[nPos].value.getValue()), pEntries[nPos].value.getValueTypeRef(), diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index dd5c5bd12c40..234e57569a73 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.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 @@ -57,7 +57,7 @@ using cppuhelper::detail::XExceptionThrower; struct ExceptionThrower : public uno_Interface, XExceptionThrower { inline ExceptionThrower(); - + public: static ExceptionThrower * get(); static inline Type const & getCppuType() @@ -65,13 +65,13 @@ public: return ::getCppuType( reinterpret_cast< Reference< XExceptionThrower > const * >(0) ); } - + // XInterface virtual Any SAL_CALL queryInterface( Type const & type ) throw (RuntimeException); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); - + // XExceptionThrower virtual void SAL_CALL throwException( Any const & exc ) throw (Exception); virtual void SAL_CALL rethrowException() throw (Exception); @@ -91,7 +91,7 @@ static void SAL_CALL ExceptionThrower_dispatch( void * pReturn, void * pArgs [], uno_Any ** ppException ) { OSL_ASSERT( pMemberType->eTypeClass == typelib_TypeClass_INTERFACE_METHOD ); - + switch (reinterpret_cast< typelib_InterfaceMemberTypeDescription * >( const_cast< typelib_TypeDescription * >( pMemberType ) )-> nPosition) @@ -222,7 +222,7 @@ void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) ) "(must be derived from com::sun::star::uno::Exception)!"), Reference< XInterface >() ); } - + Mapping uno2cpp(Environment(OUSTR(UNO_LB_UNO)), Environment::getCurrent()); if (! uno2cpp.is()) { @@ -230,7 +230,7 @@ void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) ) OUSTR("cannot get binary UNO to C++ mapping!"), Reference< XInterface >() ); } - + Reference< XExceptionThrower > xThrower; uno2cpp.mapInterface( reinterpret_cast< void ** >( &xThrower ), @@ -257,11 +257,11 @@ Any SAL_CALL getCaughtException() OUSTR("cannot get binary UNO to C++ mapping!"), Reference< XInterface >() ); } - + typelib_TypeDescription * pTD = 0; TYPELIB_DANGER_GET( &pTD, ExceptionThrower::getCppuType().getTypeLibType() ); - + UnoInterfaceReference unoI; cpp2uno.mapInterface( reinterpret_cast< void ** >( &unoI.m_pUnoI ), @@ -273,21 +273,21 @@ Any SAL_CALL getCaughtException() &pMemberTD, reinterpret_cast< typelib_InterfaceTypeDescription * >( pTD )-> ppMembers[ 1 ] /* rethrowException() */ ); - + uno_Any exc_mem; uno_Any * exc = &exc_mem; unoI.dispatch( pMemberTD, 0, 0, &exc ); - + TYPELIB_DANGER_RELEASE( pMemberTD ); TYPELIB_DANGER_RELEASE( pTD ); - + if (exc == 0) { throw RuntimeException( OUSTR("rethrowing C++ exception failed!"), Reference< XInterface >() ); } - + Any ret; uno_any_destruct( &ret, reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); uno_type_any_constructAndConvert( diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 214258816577..ab23cf7a1d9e 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.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 @@ -136,15 +136,15 @@ protected: * in the createInstance and createInstanceWithArguments methods. * @return the newly created instance. Do not return a previous (one instance) instance. */ - virtual Reference<XInterface > createInstanceEveryTime( + virtual Reference<XInterface > createInstanceEveryTime( Reference< XComponentContext > const & xContext ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); Reference<XMultiServiceFactory > xSMgr; - ComponentInstantiation pCreateFunction; + ComponentInstantiation pCreateFunction; ComponentFactoryFunc m_fptr; - Sequence< OUString > aServiceNames; - OUString aImplementationName; + Sequence< OUString > aServiceNames; + OUString aImplementationName; }; OSingleFactoryHelper::~OSingleFactoryHelper() { @@ -273,7 +273,7 @@ Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames(void) //---------------------------------------------------------------------- struct OFactoryComponentHelper_Mutex { - Mutex aMutex; + Mutex aMutex; }; class OFactoryComponentHelper @@ -374,9 +374,9 @@ public: void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); private: - Reference<XInterface > xTheInstance; - sal_Bool bOneInstance; - rtl_ModuleCount * pModuleCount; + Reference<XInterface > xTheInstance; + sal_Bool bOneInstance; + rtl_ModuleCount * pModuleCount; protected: // needed for implementing XUnloadingPreference in inheriting classes sal_Bool isOneInstance() {return bOneInstance;} @@ -549,7 +549,7 @@ sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(::com:: //----------------------------------------------------------------------------- class ORegistryFactoryHelper : public OFactoryComponentHelper, public OPropertySetHelper - + { public: ORegistryFactoryHelper( @@ -562,7 +562,7 @@ public: OPropertySetHelper( OComponentHelper::rBHelper ), xImplementationKey( xImplementationKey_ ) {} - + // XInterface virtual Any SAL_CALL queryInterface( Type const & type ) throw (RuntimeException); @@ -587,7 +587,7 @@ public: using OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( Any & rValue, sal_Int32 nHandle ) const; - + // OSingleFactoryHelper Reference<XInterface > createInstanceEveryTime( Reference< XComponentContext > const & xContext ) @@ -615,10 +615,10 @@ private: throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); /** The registry key of the implementation section */ - Reference<XRegistryKey > xImplementationKey; + Reference<XRegistryKey > xImplementationKey; /** The factory created with the loader. */ - Reference<XSingleComponentFactory > xModuleFactory; - Reference<XSingleServiceFactory > xModuleFactoryDepr; + Reference<XSingleComponentFactory > xModuleFactory; + Reference<XSingleServiceFactory > xModuleFactoryDepr; Reference< beans::XPropertySetInfo > m_xInfo; ::std::auto_ptr< IPropertyArrayHelper > m_property_array_helper; protected: @@ -880,7 +880,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() } } - Reference< XInterface > xFactory; + Reference< XInterface > xFactory; if( aActivatorName.getLength() != 0 ) { Reference<XInterface > x = xSMgr->createInstance( aActivatorName ); @@ -961,7 +961,7 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::s class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleServiceFactory, XUnloadingPreference > { - Reference<XSingleServiceFactory > xFactory; + Reference<XSingleServiceFactory > xFactory; public: diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c index e1fe9bb6abd7..0a0cea0ff8b3 100644 --- a/cppuhelper/source/findsofficepath.c +++ b/cppuhelper/source/findsofficepath.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,7 +94,7 @@ static char* platformSpecific() const char* SUBKEYNAME = "Software\\LibreOffice\\UNO\\InstallPath"; char* path = NULL; - + /* read the key's default value from HKEY_CURRENT_USER */ path = getPathFromRegistryKey( HKEY_CURRENT_USER, SUBKEYNAME ); @@ -112,13 +112,13 @@ static char* platformSpecific() #include <unistd.h> #include <limits.h> -/* +/* * Gets the installation path from the PATH environment variable. * * <p>An installation is found, if the executable 'soffice' or a symbolic link * is in one of the directories listed in the PATH environment variable.</p> * - * @return the installation path or NULL, if no installation was found or + * @return the installation path or NULL, if no installation was found or * if an error occured */ static char* platformSpecific() diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map index 88e58df6551b..59ab83e34e82 100644 --- a/cppuhelper/source/gcc3.map +++ b/cppuhelper/source/gcc3.map @@ -327,7 +327,7 @@ UDK_3.1 { UDK_3.2 { global: - _ZN4cppu20PropertySetMixinImpl10prepareSetERKN3rtl8OUStringERKN3com3sun4star3uno3AnyESB_PNS0_14BoundListenersE; + _ZN4cppu20PropertySetMixinImpl10prepareSetERKN3rtl8OUStringERKN3com3sun4star3uno3AnyESB_PNS0_14BoundListenersE; _ZN4cppu20PropertySetMixinImpl14BoundListenersC1Ev; _ZN4cppu20PropertySetMixinImpl14BoundListenersC2Ev; _ZN4cppu20PropertySetMixinImpl14BoundListenersD1Ev; diff --git a/cppuhelper/source/gcc3os2.map b/cppuhelper/source/gcc3os2.map index 2c3bd2d64b5c..681a076cee79 100644 --- a/cppuhelper/source/gcc3os2.map +++ b/cppuhelper/source/gcc3os2.map @@ -328,7 +328,7 @@ UDK_3.1 { UDK_3.2 { global: - _ZN4cppu20PropertySetMixinImpl10prepareSetERKN3rtl8OUStringERKN3com3sun4star3uno3AnyESB_PNS0_14BoundListenersE; + _ZN4cppu20PropertySetMixinImpl10prepareSetERKN3rtl8OUStringERKN3com3sun4star3uno3AnyESB_PNS0_14BoundListenersE; _ZN4cppu20PropertySetMixinImpl14BoundListenersC1Ev; _ZN4cppu20PropertySetMixinImpl14BoundListenersC2Ev; _ZN4cppu20PropertySetMixinImpl14BoundListenersD1Ev; diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 3765dbaa12c7..60f153194bef 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.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/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index 01452d81bf90..fdd5ab9665bd 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.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/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx index 0c870d8ac54c..9277a1f7d7b4 100644 --- a/cppuhelper/source/implementationentry.cxx +++ b/cppuhelper/source/implementationentry.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 @@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; namespace cppu { - + sal_Bool component_writeInfoHelper( void *, void *pRegistryKey , const struct ImplementationEntry entries[] ) { @@ -75,10 +75,10 @@ void * component_getFactoryHelper( const sal_Char * pImplName, void *, void *, const struct ImplementationEntry entries[] ) { - + void * pRet = 0; Reference< XSingleComponentFactory > xFactory; - + for( sal_Int32 i = 0 ; entries[i].create ; i ++ ) { OUString implName = entries[i].getImplementationName(); diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index 672a7f1230cc..53a06f3112c9 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.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 @@ -602,7 +602,7 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes t_long2ptr::iterator iter = pMap->begin(); t_long2ptr::iterator end = pMap->end(); - + sal_Int32 i = 0; while( iter != end ) { diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 38dc08b8af43..4bbebbd21105 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.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 @@ -102,14 +102,14 @@ class Bootstrap_MacroExpander : public mutex_holder, public t_uno_impl { protected: virtual void SAL_CALL disposing(); - + public: inline Bootstrap_MacroExpander( Reference< XComponentContext > const & ) SAL_THROW( () ) : t_uno_impl( m_mutex ) {} virtual ~Bootstrap_MacroExpander() SAL_THROW( () ); - + // XMacroExpander impl virtual OUString SAL_CALL expandMacros( OUString const & exp ) throw (lang::IllegalArgumentException); diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx index d9914aeecf09..24e3ffcd5b80 100644 --- a/cppuhelper/source/macro_expander.hxx +++ b/cppuhelper/source/macro_expander.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/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index bee27129e7b5..ec7125b448d8 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.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/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 42bb1c1c539b..11aca838c288 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.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 @@ -82,7 +82,7 @@ class OPropertySetHelperInfo_Impl { Sequence < Property > aInfos; -public: +public: OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW( () ); // XPropertySetInfo-Methoden @@ -114,7 +114,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::co /** * Return the sequence of properties, which are provided throug the constructor. */ -Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -124,7 +124,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper throw UnknownPropertyException(); } - return *pR; + return *pR; } /** @@ -139,9 +139,9 @@ sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & Proper return pR != NULL; } -// ---------------------------------------------------- -// class PropertySetHelper_Impl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class PropertySetHelper_Impl +// ---------------------------------------------------- class OPropertySetHelper::Impl { public: @@ -157,9 +157,9 @@ public: }; -// ---------------------------------------------------- -// class PropertySetHelper -// ---------------------------------------------------- +// ---------------------------------------------------- +// class PropertySetHelper +// ---------------------------------------------------- OPropertySetHelper::OPropertySetHelper( OBroadcastHelper & rBHelper_ ) SAL_THROW( () ) : rBHelper( rBHelper_ ), @@ -272,10 +272,10 @@ Any OPropertySetHelper::getPropertyValue( // XPropertySet void OPropertySetHelper::addPropertyChangeListener( - const OUString& rPropertyName, + const OUString& rPropertyName, const Reference < XPropertyChangeListener > & rxListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + throw(::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexGuard aGuard( rBHelper.rMutex ); @@ -308,11 +308,11 @@ void OPropertySetHelper::addPropertyChangeListener( aBoundLC.addInterface( (sal_Int32)nHandle, rxListener ); } - else + else // add the change listener to the helper container - rBHelper.aLC.addInterface( + rBHelper.aLC.addInterface( getPropertyTypeIdentifier( ), - rxListener + rxListener ); } } @@ -320,10 +320,10 @@ void OPropertySetHelper::addPropertyChangeListener( // XPropertySet void OPropertySetHelper::removePropertyChangeListener( - const OUString& rPropertyName, + const OUString& rPropertyName, const Reference < XPropertyChangeListener >& rxListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + throw(::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexGuard aGuard( rBHelper.rMutex ); @@ -344,9 +344,9 @@ void OPropertySetHelper::removePropertyChangeListener( } else { // remove the change listener to the helper container - rBHelper.aLC.removeInterface( + rBHelper.aLC.removeInterface( getPropertyTypeIdentifier( ), - rxListener + rxListener ); } } @@ -356,8 +356,8 @@ void OPropertySetHelper::removePropertyChangeListener( void OPropertySetHelper::addVetoableChangeListener( const OUString& rPropertyName, const Reference< XVetoableChangeListener > & rxListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + throw(::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexGuard aGuard( rBHelper.rMutex ); @@ -391,9 +391,9 @@ void OPropertySetHelper::addVetoableChangeListener( } else // add the vetoable listener to the helper container - rBHelper.aLC.addInterface( + rBHelper.aLC.addInterface( getVetoableTypeIdentifier( ), - rxListener + rxListener ); } } @@ -402,8 +402,8 @@ void OPropertySetHelper::addVetoableChangeListener( void OPropertySetHelper::removeVetoableChangeListener( const OUString& rPropertyName, const Reference < XVetoableChangeListener > & rxListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + throw(::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexGuard aGuard( rBHelper.rMutex ); @@ -426,19 +426,19 @@ void OPropertySetHelper::removeVetoableChangeListener( } else // add the vetoable listener to the helper container - rBHelper.aLC.removeInterface( - getVetoableTypeIdentifier( ), - rxListener + rBHelper.aLC.removeInterface( + getVetoableTypeIdentifier( ), + rxListener ); } } // XFastPropertySet void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, + throw(::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::beans::PropertyVetoException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OSL_ENSURE( !rBHelper.bInDispose, "do not setFastPropertyValue in the dispose call" ); @@ -453,8 +453,8 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa if( nAttributes & PropertyAttribute::READONLY ) throw PropertyVetoException(); - Any aConvertedVal; - Any aOldVal; + Any aConvertedVal; + Any aOldVal; // Will the property change? sal_Bool bChanged; @@ -481,11 +481,11 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa // set the property to the new value setFastPropertyValue_NoBroadcast( nHandle, aConvertedVal ); } - catch (const ::com::sun::star::beans::UnknownPropertyException& ) { throw; /* allowed to leave */ } - catch (const ::com::sun::star::beans::PropertyVetoException& ) { throw; /* allowed to leave */ } - catch (const ::com::sun::star::lang::IllegalArgumentException& ) { throw; /* allowed to leave */ } - catch (const ::com::sun::star::lang::WrappedTargetException& ) { throw; /* allowed to leave */ } - catch (const ::com::sun::star::uno::RuntimeException& ) { throw; /* allowed to leave */ } + catch (const ::com::sun::star::beans::UnknownPropertyException& ) { throw; /* allowed to leave */ } + catch (const ::com::sun::star::beans::PropertyVetoException& ) { throw; /* allowed to leave */ } + catch (const ::com::sun::star::lang::IllegalArgumentException& ) { throw; /* allowed to leave */ } + catch (const ::com::sun::star::lang::WrappedTargetException& ) { throw; /* allowed to leave */ } + catch (const ::com::sun::star::uno::RuntimeException& ) { throw; /* allowed to leave */ } catch (const ::com::sun::star::uno::Exception& e ) { // not allowed to leave this meathod @@ -505,8 +505,8 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa // XFastPropertySet Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + throw(::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -553,13 +553,13 @@ void OPropertySetHelper::fire // Vetoable fire and constrained attribute set or // Change fire and Changed and bound attribute set IPropertyArrayHelper & rInfo = getInfoHelper(); - sal_Int16 nAttributes; + sal_Int16 nAttributes; OUString aPropName; rInfo.fillPropertyMembersByHandle( &aPropName, &nAttributes, pnHandles[i] ); if( (bVetoable && (nAttributes & PropertyAttribute::CONSTRAINED)) || - (!bVetoable && (nAttributes & PropertyAttribute::BOUND)) + (!bVetoable && (nAttributes & PropertyAttribute::BOUND)) ) { pEvts[nChangesLen].Source = xSource; @@ -631,13 +631,13 @@ void OPropertySetHelper::fire // broadcast to all listeners with "" property name if( bVetoable ){ // fire change Events? - pLC = rBHelper.aLC.getContainer( + pLC = rBHelper.aLC.getContainer( getVetoableTypeIdentifier() ); } else { - pLC = rBHelper.aLC.getContainer( - getPropertyTypeIdentifier( ) + pLC = rBHelper.aLC.getContainer( + getPropertyTypeIdentifier( ) ); } if( pLC ) @@ -693,7 +693,7 @@ void OPropertySetHelper::fire if( !bVetoable ) { OInterfaceContainerHelper * pCont = 0; - pCont = rBHelper.aLC.getContainer( + pCont = rBHelper.aLC.getContainer( getPropertiesTypeIdentifier( ) ); if( pCont ) @@ -780,7 +780,7 @@ void OPropertySetHelper::setFastPropertyValues( pHandles[i], pValues[i] ) ) { // only increment if the property really change - pHandles[n] = pHandles[i]; + pHandles[n] = pHandles[i]; n++; } } @@ -806,7 +806,7 @@ void OPropertySetHelper::setFastPropertyValues( // fire change events fire( pHandles, pConvertedValues, pOldValues, n, sal_False ); } - catch( ... ) + catch( ... ) { delete [] pOldValues; delete [] pConvertedValues; @@ -829,7 +829,7 @@ void OPropertySetHelper::setPropertyValues( sal_Int32 * pHandles = NULL; try { - sal_Int32 nSeqLen = rPropertyNames.getLength(); + sal_Int32 nSeqLen = rPropertyNames.getLength(); pHandles = new sal_Int32[ nSeqLen ]; // get the map table IPropertyArrayHelper & rPH = getInfoHelper(); @@ -841,7 +841,7 @@ void OPropertySetHelper::setPropertyValues( catch( ... ) { delete [] pHandles; - throw; + throw; } delete [] pHandles; } @@ -850,8 +850,8 @@ void OPropertySetHelper::setPropertyValues( Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& rPropertyNames ) throw(::com::sun::star::uno::RuntimeException) { - sal_Int32 nSeqLen = rPropertyNames.getLength(); - sal_Int32 * pHandles = new sal_Int32[ nSeqLen ]; + sal_Int32 nSeqLen = rPropertyNames.getLength(); + sal_Int32 * pHandles = new sal_Int32[ nSeqLen ]; Sequence< Any > aValues( nSeqLen ); // get the map table @@ -871,8 +871,8 @@ Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& r } // XMultiPropertySet -void OPropertySetHelper::addPropertiesChangeListener( - const Sequence<OUString> & , +void OPropertySetHelper::addPropertiesChangeListener( + const Sequence<OUString> & , const Reference < XPropertiesChangeListener > & rListener ) throw(::com::sun::star::uno::RuntimeException) { @@ -980,18 +980,18 @@ void OPropertySetHelper::removePropertyStateChangeListener( const OUString& aPro // static OUString makeOUString( sal_Char *p ) // { -// sal_Int32 nLen = strlen(p); -// sal_Unicode *pw = new sal_Unicode[nLen]; - -// for( int i = 0 ; i < nLen ; i ++ ) { - -// // Only ascii strings allowed with this helper ! -// OSL_ASSERT( p[i] < 127 ); -// pw[i] = p[i]; -// } -// OUString ow( pw , nLen ); -// delete pw; -// return ow; +// sal_Int32 nLen = strlen(p); +// sal_Unicode *pw = new sal_Unicode[nLen]; + +// for( int i = 0 ; i < nLen ; i ++ ) { + +// // Only ascii strings allowed with this helper ! +// OSL_ASSERT( p[i] < 127 ); +// pw[i] = p[i]; +// } +// OUString ow( pw , nLen ); +// delete pw; +// return ow; // } extern "C" { @@ -1006,7 +1006,7 @@ static int compare_Property_Impl( const void *arg1, const void *arg2 ) void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () ) { - sal_Int32 i, nElements = aInfos.getLength(); + sal_Int32 i, nElements = aInfos.getLength(); const Property* pProperties = aInfos.getConstArray(); for( i = 1; i < nElements; i++ ) @@ -1038,17 +1038,17 @@ OPropertyArrayHelper::OPropertyArrayHelper( sal_Int32 nEle, sal_Bool bSorted ) SAL_THROW( () ) - : aInfos(pProps, nEle) + : aInfos(pProps, nEle) , bRightOrdered( sal_False ) { init( bSorted ); } -OPropertyArrayHelper::OPropertyArrayHelper( +OPropertyArrayHelper::OPropertyArrayHelper( const Sequence< Property > & aProps, sal_Bool bSorted ) SAL_THROW( () ) - : aInfos(aProps) + : aInfos(aProps) , bRightOrdered( sal_False ) { init( bSorted ); @@ -1069,7 +1069,7 @@ sal_Bool OPropertyArrayHelper::fillPropertyMembersByHandle ) { const Property* pProperties = aInfos.getConstArray(); - sal_Int32 nElements = aInfos.getLength(); + sal_Int32 nElements = aInfos.getLength(); if( bRightOrdered ) { @@ -1198,7 +1198,7 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc else { // binary search is better - sal_Int32 nCompVal = 1; + sal_Int32 nCompVal = 1; const Property * pOldEnd = pEnd--; const Property * pMid = pCur; diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index 17b6eadb02af..919fe7bbb995 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.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 @@ -309,7 +309,7 @@ static void add_access_control_entries( context_values.push_back( entry ); } } - + // - ac prop: mode // { "off", "on", "dynamic-only", "single-user", "single-default-user" } entry.bLateInitService = false; @@ -338,7 +338,7 @@ Reference< lang::XMultiComponentFactory > bootstrapInitialSF( Reference< lang::XMultiServiceFactory >(), Reference< registry::XRegistryKey >() ) ), UNO_QUERY ); - + // add initial bootstrap services static char const * ar[] = { "bootstrap.uno" SAL_DLLEXTENSION, @@ -411,7 +411,7 @@ Reference< XComponentContext > bootstrapInitialContext( if (xKey.is()) { entry.bLateInitService = true; - + Sequence< Reference< registry::XRegistryKey > > keys( xKey->openKeys() ); Reference< registry::XRegistryKey > const * pKeys = @@ -612,7 +612,7 @@ static Reference< lang::XMultiComponentFactory > createImplServiceFactory( Reference< XComponentContext > xContext( bootstrapInitialContext( xSF, xRegistry, xRegistry, rBootstrapPath, bootstrap ) ); - + // initialize sf Reference< lang::XInitialization > xInit( xSF, UNO_QUERY ); OSL_ASSERT( xInit.is() ); @@ -646,7 +646,7 @@ Reference< XComponentContext > SAL_CALL bootstrap_InitialComponentContext( Reference< XComponentContext > xContext( bootstrapInitialContext( xSF, xRegistry, xRegistry, rBootstrapPath, bootstrap ) ); - + // initialize sf Reference< lang::XInitialization > xInit( xSF, UNO_QUERY ); OSL_ASSERT( xInit.is() ); diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index c9e1a35a5361..1be484c49336 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.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 @@ -275,8 +275,8 @@ static OUString makeComponentPath( //============================================================================== static OUString getLibEnv(OUString const & aModulePath, - oslModule lib, - uno::Environment * pEnv, + oslModule lib, + uno::Environment * pEnv, OUString * pSourceEnv_name, uno::Environment const & cTargetEnv, OUString const & cImplName = OUString()) @@ -286,7 +286,7 @@ static OUString getLibEnv(OUString const & aModulePath, sal_Char const * pEnvTypeName = NULL; OUString aGetEnvNameExt = OUSTR(COMPONENT_GETENVEXT); - component_getImplementationEnvironmentExtFunc pGetImplEnvExt = + component_getImplementationEnvironmentExtFunc pGetImplEnvExt = (component_getImplementationEnvironmentExtFunc)osl_getFunctionSymbol(lib, aGetEnvNameExt.pData); if (pGetImplEnvExt) @@ -297,8 +297,8 @@ static OUString getLibEnv(OUString const & aModulePath, else { OUString aGetEnvName = OUSTR(COMPONENT_GETENV); - component_getImplementationEnvironmentFunc pGetImplEnv = - (component_getImplementationEnvironmentFunc)osl_getFunctionSymbol( + component_getImplementationEnvironmentFunc pGetImplEnv = + (component_getImplementationEnvironmentFunc)osl_getFunctionSymbol( lib, aGetEnvName.pData ); if (pGetImplEnv) pGetImplEnv(&pEnvTypeName, (uno_Environment **)pEnv); @@ -311,7 +311,7 @@ static OUString getLibEnv(OUString const & aModulePath, aExcMsg += OUSTR("- nor: "); } } - + if (!pEnv->is() && pEnvTypeName) { *pSourceEnv_name = OUString::createFromAscii(pEnvTypeName); @@ -329,15 +329,15 @@ static OUString getLibEnv(OUString const & aModulePath, *pSourceEnv_name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":log")); break; } - } while( nIndex != -1 ); + } while( nIndex != -1 ); } - + } return aExcMsg; } -extern "C" {static void s_getFactory(va_list * pParam) +extern "C" {static void s_getFactory(va_list * pParam) { component_getFactoryFunc pSym = va_arg(*pParam, component_getFactoryFunc); OString const * pImplName = va_arg(*pParam, OString const *); @@ -363,7 +363,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( aModulePath, Reference< XInterface >() ); } - + oslModule lib = osl_loadModule( aModulePath.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (! lib) @@ -392,7 +392,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( if (!env.is()) env = uno::Environment(aEnvTypeName); - + if (env.is() && currentEnv.is()) { #if OSL_DEBUG_LEVEL > 1 @@ -400,23 +400,23 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( rtl::OString libName(rtl::OUStringToOString(rLibName, RTL_TEXTENCODING_ASCII_US)); rtl::OString implName(rtl::OUStringToOString(rImplName, RTL_TEXTENCODING_ASCII_US)); rtl::OString envDcp(rtl::OUStringToOString(env.getTypeName(), RTL_TEXTENCODING_ASCII_US)); - + fprintf(stderr, "loadSharedLibComponentFactory envDcp: %-12.12s implName: %30.30s libName: %-15.15s\n", envDcp.getStr(), implName.getStr() + (implName.getLength() > 30 ? implName.getLength() - 30 : 0), libName.getStr()); } #endif Mapping aCurrent2Env( currentEnv, env ); Mapping aEnv2Current( env, currentEnv ); - + if (aCurrent2Env.is() && aEnv2Current.is()) { void * pSMgr = aCurrent2Env.mapInterface( xMgr.get(), ::getCppuType( &xMgr ) ); void * pKey = aCurrent2Env.mapInterface( xKey.get(), ::getCppuType( &xKey ) ); - + void * pSSF = NULL; - + env.invoke(s_getFactory, pSym, &aImplName, pSMgr, pKey, &pSSF); if (pKey) @@ -429,7 +429,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( (*env.get()->pExtEnv->releaseInterface)( env.get()->pExtEnv, pSMgr ); } - + if (pSSF) { aEnv2Current.mapInterface( @@ -484,7 +484,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( } //============================================================================== -extern "C" { static void s_writeInfo(va_list * pParam) +extern "C" { static void s_writeInfo(va_list * pParam) { component_writeInfoFunc pSym = va_arg(*pParam, component_writeInfoFunc); void * pSMgr = va_arg(*pParam, void *); @@ -510,7 +510,7 @@ void SAL_CALL writeSharedLibComponentInfo( aModulePath, Reference< XInterface >() ); } - + oslModule lib = osl_loadModule( aModulePath.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (! lib) @@ -524,7 +524,7 @@ void SAL_CALL writeSharedLibComponentInfo( uno::Environment currentEnv(Environment::getCurrent()); uno::Environment env; - + OUString aEnvTypeName; OUString aExcMsg = getLibEnv(aModulePath, lib, &env, &aEnvTypeName, currentEnv); if (!aExcMsg.getLength()) @@ -535,7 +535,7 @@ void SAL_CALL writeSharedLibComponentInfo( { if (!env.is()) env = uno::Environment(aEnvTypeName); - + if (env.is() && currentEnv.is()) { Mapping aCurrent2Env( currentEnv, env ); @@ -566,7 +566,7 @@ void SAL_CALL writeSharedLibComponentInfo( aExcMsg += OUSTR(": registry is mandatory to invoke" " component_writeInfo()!"); } - + if (pSMgr) { (*env.get()->pExtEnv->releaseInterface)( diff --git a/cppuhelper/source/stdidlclass.cxx b/cppuhelper/source/stdidlclass.cxx index 512913c65811..1852b6827b78 100644 --- a/cppuhelper/source/stdidlclass.cxx +++ b/cppuhelper/source/stdidlclass.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 @@ -48,30 +48,30 @@ using namespace com::sun::star::reflection; using namespace rtl; namespace cppu { - + /*--------------------------------------------------------- -* This helper class implements XIdlClass. Is used by -* createStdIdlClass() +* This helper class implements XIdlClass. Is used by +* createStdIdlClass() *---------------------------------------------------------*/ -class OStdIdlClass : +class OStdIdlClass : public OWeakObject, public XIdlClass, public XIdlClassProvider { public: - OStdIdlClass( - const Reference < XMultiServiceFactory > &rSMgr , - const OUString & sImplementationName , + OStdIdlClass( + const Reference < XMultiServiceFactory > &rSMgr , + const OUString & sImplementationName , const Reference < XIdlClass > & rSuperClass, - const Sequence < OUString > &seq + const Sequence < OUString > &seq ) SAL_THROW( () ); // XInterface - Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) + Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // XIdlClassProvider Sequence< Reference < XIdlClass > > SAL_CALL getIdlClasses(void) @@ -79,7 +79,7 @@ public: // XIdlClass virtual Sequence< Reference< XIdlClass > > SAL_CALL getClasses( ) throw(RuntimeException) - { return Sequence < Reference < XIdlClass > > (); } + { return Sequence < Reference < XIdlClass > > (); } virtual Reference< XIdlClass > SAL_CALL getClass( const ::rtl::OUString& ) throw(RuntimeException) { return Reference < XIdlClass > (); } virtual sal_Bool SAL_CALL equals( const Reference< XIdlClass >& Type ) throw(RuntimeException) @@ -111,10 +111,10 @@ public: virtual void SAL_CALL createObject( Any& ) throw(RuntimeException) {} private: - OUString m_sImplementationName; - Sequence < OUString > m_seqSupportedInterface; - Sequence < Reference < XIdlClass > > m_seqSuperClasses; - Reference < XMultiServiceFactory > m_rSMgr; + OUString m_sImplementationName; + Sequence < OUString > m_seqSupportedInterface; + Sequence < Reference < XIdlClass > > m_seqSuperClasses; + Reference < XMultiServiceFactory > m_rSMgr; Reference< XIdlReflection > m_xCorefl; Reference< XIdlReflection > const & get_corefl() SAL_THROW( (RuntimeException) ); @@ -141,7 +141,7 @@ Reference< XIdlReflection > const & OStdIdlClass::get_corefl() xContext->getValueByName( OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection") ) ) >>= x; OSL_ENSURE( x.is(), "### CoreReflection singleton not accessible!?" ); - + if (x.is()) { ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() ); @@ -164,10 +164,10 @@ Reference< XIdlReflection > const & OStdIdlClass::get_corefl() } OStdIdlClass::OStdIdlClass( - const Reference < XMultiServiceFactory > &rSMgr , - const OUString & sImplementationName , + const Reference < XMultiServiceFactory > &rSMgr , + const OUString & sImplementationName , const Reference < XIdlClass > & rSuperClass, - const Sequence < OUString > &seq + const Sequence < OUString > &seq ) SAL_THROW( () ) : m_sImplementationName( sImplementationName ) , m_seqSupportedInterface( seq ), @@ -175,17 +175,17 @@ OStdIdlClass::OStdIdlClass( { if( rSuperClass.is() ) m_seqSuperClasses = Sequence< Reference < XIdlClass > >( &rSuperClass, 1 ); - + } - + Any SAL_CALL OStdIdlClass::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException) { Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlClass * >( this ), static_cast< XIdlClassProvider * >( this ) ) ); - + return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); -} +} Sequence< Reference< XIdlClass > > SAL_CALL OStdIdlClass::getInterfaces( ) throw(RuntimeException) @@ -196,12 +196,12 @@ Sequence< Reference< XIdlClass > > SAL_CALL OStdIdlClass::getInterfaces( ) thro if( rCoreRefl.is() ) { Sequence< Reference< XIdlClass > > seqClasses( nMax ); - + for( int n = 0 ; n < nMax ; n++ ) { seqClasses.getArray()[n] = rCoreRefl->forName( m_seqSupportedInterface.getArray()[n] ); - } - + } + return seqClasses; } return Sequence< Reference< XIdlClass > > () ; @@ -213,14 +213,14 @@ Sequence< Reference < XIdlClass > > SAL_CALL OStdIdlClass::getIdlClasses(void) throw (RuntimeException) { // weak reference to cache the standard class - static WeakReference< XIdlClass > weakRef; - - // try to make weakref hard + static WeakReference< XIdlClass > weakRef; + + // try to make weakref hard Reference < XIdlClass > r = weakRef; - if( ! r.is() ) { + if( ! r.is() ) { // xidlclass has not been initialized before or has been destroyed already. - r = ::cppu::createStandardClass( + r = ::cppu::createStandardClass( m_rSMgr , OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.cppuhelper.OStdIdlClass") ) , Reference < XIdlClass > () , @@ -240,20 +240,20 @@ Sequence< Reference < XIdlClass > > SAL_CALL OStdIdlClass::getIdlClasses(void) // external constructor XIdlClass * SAL_CALL createStandardClassWithSequence( - const Reference < XMultiServiceFactory > &rSMgr , - const OUString & sImplementationName , + const Reference < XMultiServiceFactory > &rSMgr , + const OUString & sImplementationName , const Reference < XIdlClass > & rSuperClass, const Sequence < OUString > &seqInterfaceNames ) SAL_THROW( () ) { - return SAL_STATIC_CAST( - XIdlClass * , - new OStdIdlClass( - rSMgr , + return SAL_STATIC_CAST( + XIdlClass * , + new OStdIdlClass( + rSMgr , sImplementationName, - rSuperClass, - seqInterfaceNames - ) + rSuperClass, + seqInterfaceNames + ) ); } diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index c5b76e4fe4af..570a7b4505d6 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.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 @@ -130,9 +130,9 @@ inline static typelib_TypeDescription * createCTD( sal_Int32 nMembers = aDiscriminants.getLength(); OSL_ASSERT( nMembers == aMemberNames.getLength() && nMembers == aMemberTypes.getLength() ); - const Any * pDiscriminants = aDiscriminants.getConstArray(); - const Reference< XTypeDescription > * pMemberTypes = aMemberTypes.getConstArray(); - const OUString * pMemberNames = aMemberNames.getConstArray(); + const Any * pDiscriminants = aDiscriminants.getConstArray(); + const Reference< XTypeDescription > * pMemberTypes = aMemberTypes.getConstArray(); + const OUString * pMemberNames = aMemberNames.getConstArray(); typelib_Union_Init * pMembers = (typelib_Union_Init *)alloca( nMembers * sizeof(typelib_Union_Init) ); @@ -182,10 +182,10 @@ inline static typelib_TypeDescription * createCTD( // construct member init array const Sequence<Reference< XTypeDescription > > & rMemberTypes = xType->getMemberTypes(); - const Sequence< OUString > & rMemberNames = xType->getMemberNames(); + const Sequence< OUString > & rMemberNames = xType->getMemberNames(); const Reference< XTypeDescription > * pMemberTypes = rMemberTypes.getConstArray(); - const OUString * pMemberNames = rMemberNames.getConstArray(); + const OUString * pMemberNames = rMemberNames.getConstArray(); sal_Int32 nMembers = rMemberTypes.getLength(); OSL_ENSURE( nMembers == rMemberNames.getLength(), "### lens differ!" ); @@ -240,10 +240,10 @@ inline static typelib_TypeDescription * createCTD( // construct member init array const Sequence<Reference< XTypeDescription > > & rMemberTypes = xType->getMemberTypes(); - const Sequence< OUString > & rMemberNames = xType->getMemberNames(); + const Sequence< OUString > & rMemberNames = xType->getMemberNames(); const Reference< XTypeDescription > * pMemberTypes = rMemberTypes.getConstArray(); - const OUString * pMemberNames = rMemberNames.getConstArray(); + const OUString * pMemberNames = rMemberNames.getConstArray(); sal_Int32 nMembers = rMemberTypes.getLength(); OSL_ENSURE( nMembers == rMemberNames.getLength(), "### lens differ!" ); @@ -333,7 +333,7 @@ static typelib_TypeDescription * createCTD( // init all params const Sequence<Reference< XMethodParameter > > & rParams = xMethod->getParameters(); - const Reference< XMethodParameter > * pParams = rParams.getConstArray(); + const Reference< XMethodParameter > * pParams = rParams.getConstArray(); sal_Int32 nParams = rParams.getLength(); typelib_Parameter_Init * pParamInit = (typelib_Parameter_Init *)alloca( @@ -343,7 +343,7 @@ static typelib_TypeDescription * createCTD( for ( nPos = nParams; nPos--; ) { const Reference< XMethodParameter > & xParam = pParams[nPos]; - const Reference< XTypeDescription > & xType = xParam->getType(); + const Reference< XTypeDescription > & xType = xParam->getType(); typelib_Parameter_Init & rInit = pParamInit[xParam->getPosition()]; rInit.eTypeClass = (typelib_TypeClass)xType->getTypeClass(); diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx index 9707d7310dbe..fd403f9d2beb 100644 --- a/cppuhelper/source/typeprovider.cxx +++ b/cppuhelper/source/typeprovider.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 @@ -65,7 +65,7 @@ static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSou { Type * pDest = rDest.getArray(); const Type * pSource = rSource.getConstArray(); - + for ( sal_Int32 nPos = rSource.getLength(); nPos--; ) pDest[nOffset+ nPos] = pSource[nPos]; } diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx index 724ea00ad4dc..eff9f8a0be2a 100644 --- a/cppuhelper/source/unourl.cxx +++ b/cppuhelper/source/unourl.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/source/weak.cxx b/cppuhelper/source/weak.cxx index 0224390b9436..1dd76d26758e 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ using namespace com::sun::star::uno; /** */ //for docpp namespace cppu -{ +{ // due to static Reflection destruction from usr, ther must be a mutex leak (#73272#) inline static Mutex & getWeakMutex() SAL_THROW( () ) @@ -63,12 +63,12 @@ public: , m_pObject(pObj) , m_aReferences( getWeakMutex() ) {} - + // XInterface - Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw(); - void SAL_CALL release() throw(); - + Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw(); + void SAL_CALL release() throw(); + // XAdapter ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException); @@ -84,11 +84,11 @@ private: virtual ~OWeakConnectionPoint() {} /// The reference counter. - oslInterlockedCount m_aRefCount; + oslInterlockedCount m_aRefCount; /// The weak object - OWeakObject* m_pObject; + OWeakObject* m_pObject; /// The container to hold the weak references - OInterfaceContainerHelper m_aReferences; + OInterfaceContainerHelper m_aReferences; }; // XInterface @@ -103,7 +103,7 @@ Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType ) void SAL_CALL OWeakConnectionPoint::acquire() throw() { osl_incrementInterlockedCount( &m_aRefCount ); -} +} // XInterface void SAL_CALL OWeakConnectionPoint::release() throw() @@ -133,18 +133,18 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::Runti cppu::throwException(ex); } } - + // XInterface Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::com::sun::star::uno::RuntimeException) { Reference< XInterface > ret; - + ClearableMutexGuard guard(getWeakMutex()); - + if (m_pObject) { oslInterlockedCount n = osl_incrementInterlockedCount( &m_pObject->m_refCount ); - + if (n > 1) { // The refence is incremented. The object cannot be destroyed. @@ -158,7 +158,7 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::co // Another thread wait in the dispose method at the guard n = osl_decrementInterlockedCount( &m_pObject->m_refCount ); } - + return ret; } @@ -167,14 +167,14 @@ void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >& throw(::com::sun::star::uno::RuntimeException) { m_aReferences.addInterface( (const Reference< XInterface > &)rRef ); -} +} // XInterface void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference >& rRef) throw(::com::sun::star::uno::RuntimeException) { m_aReferences.removeInterface( (const Reference< XInterface > &)rRef ); -} +} //------------------------------------------------------------------------ @@ -196,13 +196,13 @@ Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun: return ::cppu::queryInterface( rType, static_cast< XWeak * >( this ), static_cast< XInterface * >( this ) ); -} +} // XInterface void SAL_CALL OWeakObject::acquire() throw() { osl_incrementInterlockedCount( &m_refCount ); -} +} // XInterface void SAL_CALL OWeakObject::release() throw() @@ -214,7 +214,7 @@ void SAL_CALL OWeakObject::release() throw() // destroy object: delete this; } -} +} void OWeakObject::disposeWeakConnectionPoint() { @@ -254,9 +254,9 @@ Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter() m_pWeakConnectionPoint = p; } } - + return m_pWeakConnectionPoint; -} +} //------------------------------------------------------------------------ //-- OWeakAggObject ---------------------------------------------------- @@ -273,7 +273,7 @@ void OWeakAggObject::acquire() throw() x->acquire(); else OWeakObject::acquire(); -} +} // XInterface void OWeakAggObject::release() throw() @@ -312,16 +312,16 @@ void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) t /** */ //for docpp namespace com -{ +{ /** */ //for docpp namespace sun -{ +{ /** */ //for docpp namespace star -{ +{ /** */ //for docpp namespace uno -{ +{ //------------------------------------------------------------------------ @@ -333,19 +333,19 @@ public: OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ); OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () ); virtual ~OWeakRefListener() SAL_THROW( () ); - + // XInterface Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException); void SAL_CALL acquire() throw(); void SAL_CALL release() throw(); - + // XReference - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); /// The reference counter. - oslInterlockedCount m_aRefCount; + oslInterlockedCount m_aRefCount; /// The connection point of the weak object - Reference< XAdapter > m_XWeakConnectionPoint; + Reference< XAdapter > m_XWeakConnectionPoint; private: OWeakRefListener& SAL_CALL operator=(const OWeakRefListener& rRef) SAL_THROW( () ); @@ -358,7 +358,7 @@ OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () ) try { m_XWeakConnectionPoint = rRef.m_XWeakConnectionPoint; - + if (m_XWeakConnectionPoint.is()) { m_XWeakConnectionPoint->addReference((XReference*)this); @@ -374,11 +374,11 @@ OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THRO try { Reference< XWeak > xWeak( Reference< XWeak >::query( xInt ) ); - + if (xWeak.is()) { m_XWeakConnectionPoint = xWeak->queryAdapter(); - + if (m_XWeakConnectionPoint.is()) { m_XWeakConnectionPoint->addReference((XReference*)this); @@ -400,29 +400,29 @@ OWeakRefListener::~OWeakRefListener() SAL_THROW( () ) } } catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected() -} +} // XInterface Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType ) throw(RuntimeException) { return ::cppu::queryInterface( rType, static_cast< XReference * >( this ), static_cast< XInterface * >( this ) ); -} +} // XInterface void SAL_CALL OWeakRefListener::acquire() throw() { osl_incrementInterlockedCount( &m_aRefCount ); -} +} // XInterface void SAL_CALL OWeakRefListener::release() throw() { if( ! osl_decrementInterlockedCount( &m_aRefCount ) ) delete this; -} +} -void SAL_CALL OWeakRefListener::dispose() +void SAL_CALL OWeakRefListener::dispose() throw(::com::sun::star::uno::RuntimeException) { Reference< XAdapter > xAdp; @@ -437,7 +437,7 @@ void SAL_CALL OWeakRefListener::dispose() if( xAdp.is() ) xAdp->removeReference((XReference*)this); -} +} //------------------------------------------------------------------------ //-- WeakReferenceHelper ---------------------------------------------------------- @@ -450,7 +450,7 @@ WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SA m_pImpl = new OWeakRefListener(xInt); m_pImpl->acquire(); } -} +} WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SAL_THROW( () ) : m_pImpl( 0 ) @@ -529,13 +529,13 @@ Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () ) return xAdp->queryAdapted(); } catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected() - + return Reference< XInterface >(); } } } } -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx index 90e4bb65b9e6..578378ee2898 100644 --- a/cppuhelper/test/bootstrap/TestEnv.cxx +++ b/cppuhelper/test/bootstrap/TestEnv.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 @@ -47,7 +47,7 @@ #endif -class SAL_DLLPRIVATE TestEnv : public cppu::Enterable +class SAL_DLLPRIVATE TestEnv : public cppu::Enterable { int m_inCount; @@ -96,7 +96,7 @@ void TestEnv::v_enter(void) { ++ m_inCount; } - + void TestEnv::v_leave(void) { -- m_inCount; diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx index 5aa09b704680..b0eadb6946a1 100644 --- a/cppuhelper/test/bootstrap/bootstrap.test.cxx +++ b/cppuhelper/test/bootstrap/bootstrap.test.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 @@ -55,7 +55,7 @@ using namespace com::sun::star; static rtl::OUString s_comment; static bool s_check_object_is_in(void * pObject) -{ +{ uno::Environment currentEnv(uno::Environment::getCurrent()); rtl_uString * pOId = NULL; @@ -65,7 +65,7 @@ static bool s_check_object_is_in(void * pObject) uno::TypeDescription typeDescription(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface"))); void * pRegisteredObject = NULL; - currentEnv.get()->pExtEnv->getRegisteredInterface(currentEnv.get()->pExtEnv, + currentEnv.get()->pExtEnv->getRegisteredInterface(currentEnv.get()->pExtEnv, &pRegisteredObject, pOId, (typelib_InterfaceTypeDescription *)typeDescription.get()); @@ -81,10 +81,10 @@ static bool s_check_object_is_in(void * pObject) return result; } -static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPurpose, - rtl::OUString const & servicePurpose) +static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPurpose, + rtl::OUString const & servicePurpose) { - cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) + cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) + clientPurpose, NULL)); if (clientPurpose.getLength() && !envGuard.is()) { @@ -110,13 +110,13 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu uno::Reference<registry::XRegistryKey>() ) ); - + if (!xItf.is()) { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n")); return; } - + if (!clientPurpose.equals(servicePurpose) && !s_check_object_is_in(xItf.get())) { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tcouldn't find object in current purpose \"")); @@ -132,22 +132,22 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu } } -static void s_test__loadSharedLibComponentFactory__free_free() +static void s_test__loadSharedLibComponentFactory__free_free() { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__free_free\n")); s_test__loadSharedLibComponentFactory(rtl::OUString(), rtl::OUString()); } -static void s_test__loadSharedLibComponentFactory__free_purpose() +static void s_test__loadSharedLibComponentFactory__free_purpose() { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__free_purpose\n")); - s_test__loadSharedLibComponentFactory(rtl::OUString(), + s_test__loadSharedLibComponentFactory(rtl::OUString(), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv"))); } -static void s_test__loadSharedLibComponentFactory__purpose_free() +static void s_test__loadSharedLibComponentFactory__purpose_free() { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__purpose_free\n")); @@ -155,11 +155,11 @@ static void s_test__loadSharedLibComponentFactory__purpose_free() rtl::OUString()); } -static void s_test__loadSharedLibComponentFactory__purpose_purpose() +static void s_test__loadSharedLibComponentFactory__purpose_purpose() { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__purpose_purpose\n")); - s_test__loadSharedLibComponentFactory(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")), + s_test__loadSharedLibComponentFactory(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv"))); } @@ -192,7 +192,7 @@ static rtl::OUString s_getSDrive(void) static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose) { - cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) + cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) + clientPurpose, NULL)); if (clientPurpose.getLength() && !envGuard.is()) { @@ -211,7 +211,7 @@ static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose) s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n")); return; } - + if (clientPurpose.getLength() != 0 && !s_check_object_is_in(registry.get())) { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tcouldn't find object in current purpose \"")); @@ -237,7 +237,7 @@ static void s_test__createSimpleRegistry__purpose(void) static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clientPurpose) { - cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) + cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) + clientPurpose, NULL)); if (clientPurpose.getLength() && !envGuard.is()) { @@ -259,7 +259,7 @@ static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clie s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n")); return; } - + if (clientPurpose.getLength() != 0 && !s_check_object_is_in(xContext.get())) { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tcouldn't find object in current purpose \"")); @@ -305,16 +305,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n")); ret = 0; } - else + else { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n")); ret = -1; } - std::cerr - << argv[0] - << std::endl - << rtl::OUStringToOString(s_comment, RTL_TEXTENCODING_ASCII_US).getStr() + std::cerr + << argv[0] + << std::endl + << rtl::OUStringToOString(s_comment, RTL_TEXTENCODING_ASCII_US).getStr() << std::endl; return ret; diff --git a/cppuhelper/test/cfg_data/instance/uno/components.xml b/cppuhelper/test/cfg_data/instance/uno/components.xml index 83305fca1273..b0ea5ce3b291 100644 --- a/cppuhelper/test/cfg_data/instance/uno/components.xml +++ b/cppuhelper/test/cfg_data/instance/uno/components.xml @@ -5,7 +5,7 @@ xmlns:cfg="http://openoffice.org/2000/registry/instance" xmlns="http://openoffice.org/2000/uno/Components"> - + <services cfg:type="set" cfg:element-type="service"> <service cfg:name="com.sun.star.script.Converter"> @@ -13,7 +13,7 @@ com.sun.star.comp.stoc.TypeConverter </available-implementations> </service> - + <service cfg:name="com.sun.star.bootstrap.TestComponent0"> <available-implementations cfg:type="string" cfg:derivedBy="list"> com.sun.star.comp.bootstrap.TestComponent0 @@ -23,7 +23,7 @@ <cfg:any cfg:name="serviceprop1" cfg:type="string">value of serviceprop1</cfg:any> </context-properties> </service> - + </services> @@ -34,7 +34,7 @@ <url cfg:type="string">tcv.dll</url> <supported-services cfg:type="string" cfg:derivedBy="list">com.sun.star.script.Converter</supported-services> </implementation> - + <implementation cfg:name="com.sun.star.comp.bootstrap.TestComponent0"> <activator cfg:type="string">com.sun.star.loader.SharedLibrary</activator> <url cfg:type="string">cfg_test.dll</url> @@ -44,7 +44,7 @@ <cfg:any cfg:name="implprop1" cfg:type="string">value of implprop1</cfg:any> </context-properties> </implementation> - + </implementations> @@ -53,7 +53,7 @@ <singleton cfg:name="com.sun.star.script.theConverter"> <used-service cfg:type="string">com.sun.star.script.Converter</used-service> </singleton> - + <singleton cfg:name="com.sun.star.bootstrap.theTestComponent0"> <used-service cfg:type="string">com.sun.star.bootstrap.TestComponent0</used-service> <initial-arguments cfg:type="set" cfg:element-type="cfg:any"> @@ -62,14 +62,14 @@ <cfg:any cfg:name="2" cfg:type="string">third argument</cfg:any> </initial-arguments> </singleton> - + </singletons> <global-context-properties cfg:type="set" cfg:element-type="cfg:any"> <cfg:any cfg:name="TestValue" cfg:type="int">5</cfg:any> - + </global-context-properties> diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 53345815f186..2a0671867157 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.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 @@ -90,13 +90,13 @@ class ServiceImpl0 : public WeakImplHelper2< lang::XServiceInfo, lang::XInitialization > { Reference< XComponentContext > m_xContext; - + public: ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW( () ); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& rArgs ) throw (Exception, RuntimeException); - + // XServiceInfo virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); @@ -108,7 +108,7 @@ ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SA { sal_Int32 n; OUString val; - + // service properties OSL_VERIFY( m_xContext->getValueByName( OUSTR("/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop0") ) >>= n ); @@ -173,7 +173,7 @@ public: inline ServiceImpl1( Reference< XComponentContext > const & xContext ) SAL_THROW( () ) : ServiceImpl0( xContext ) {} - + // XServiceInfo virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); @@ -259,19 +259,19 @@ SAL_IMPLEMENT_MAIN() { Reference< XComponentContext > xContext( defaultBootstrap_InitialComponentContext() ); Reference< lang::XMultiComponentFactory > xMgr( xContext->getServiceManager() ); - + // show what is in context xContext->getValueByName( OUSTR("dump_maps") ); - + sal_Int32 n; OSL_VERIFY( xContext->getValueByName( OUSTR("/global-context-properties/TestValue") ) >>= n ); ::fprintf( stderr, "> n=%d\n", n ); - + Reference< XInterface > x; OSL_VERIFY( !(xContext->getValueByName( OUSTR("/singletons/my_converter") ) >>= x) ); OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.script.theConverter") ) >>= x ); OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.bootstrap.theTestComponent0") ) >>= x ); - + ::fprintf( stderr, "> registering service...\n", n ); #if defined(SAL_W32) || defined(SAL_OS2) OUString libName( OUSTR("cfg_test.dll") ); @@ -284,10 +284,10 @@ SAL_IMPLEMENT_MAIN() xImplReg->registerImplementation( OUSTR("com.sun.star.loader.SharedLibrary"), libName, Reference< registry::XSimpleRegistry >() ); - + OSL_VERIFY( (x = xMgr->createInstanceWithContext( OUSTR("com.sun.star.bootstrap.TestComponent0"), xContext )).is() ); OSL_VERIFY( (x = xMgr->createInstanceWithContext( OUSTR("com.sun.star.bootstrap.TestComponent1"), xContext )).is() ); - + Reference< lang::XComponent > xComp( xContext, UNO_QUERY ); if (xComp.is()) { diff --git a/cppuhelper/test/helpertest.idl b/cppuhelper/test/helpertest.idl index daa69656f4ef..e78629ab5313 100644 --- a/cppuhelper/test/helpertest.idl +++ b/cppuhelper/test/helpertest.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ module test { - + interface A : com::sun::star::uno::XInterface { string a(); diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx index 34846197d030..53d5d96ac175 100644 --- a/cppuhelper/test/loader/loader.test.cxx +++ b/cppuhelper/test/loader/loader.test.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 @@ -83,12 +83,12 @@ public: -static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pServicePurpose) +static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pServicePurpose) { rtl::OUString result; - rtl::OUString servicePurpose = rtl::OUString(pServicePurpose, - rtl_str_getLength(pServicePurpose), + rtl::OUString servicePurpose = rtl::OUString(pServicePurpose, + rtl_str_getLength(pServicePurpose), RTL_TEXTENCODING_ASCII_US); result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_loadSharedLibComponentFactory ")); @@ -110,7 +110,7 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe if (envDcp_purpose == servicePurpose) result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n")); - else + else { result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILED - got: \"")); result += envDcp_purpose; @@ -126,12 +126,12 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe return result; } -static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServicePurpose) +static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServicePurpose) { rtl::OUString result; - rtl::OUString servicePurpose = rtl::OUString(pServicePurpose, - rtl_str_getLength(pServicePurpose), + rtl::OUString servicePurpose = rtl::OUString(pServicePurpose, + rtl_str_getLength(pServicePurpose), RTL_TEXTENCODING_ASCII_US); result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_writeSharedLibComponentInfo ")); @@ -157,7 +157,7 @@ static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServ if (envDcp_purpose == servicePurpose) result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n")); - else + else { result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILED - got: \"")); result += envDcp_purpose; @@ -190,11 +190,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) message += s_test__cppu_writeSharedLibComponentInfo(":unsafe"); message += s_test__cppu_writeSharedLibComponentInfo(":affine"); message += s_test__cppu_writeSharedLibComponentInfo(""); - + if (message.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILED"))) == -1) message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n")); - else + else { message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n")); result = -1; diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx index b8858f3329bd..83bdac1a47a2 100644 --- a/cppuhelper/test/testcmp/TestComponent.cxx +++ b/cppuhelper/test/testcmp/TestComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,12 +84,12 @@ public: uno::Any SAL_CALL queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL release() throw (); void SAL_CALL acquire() throw (); - + // lang::XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) throw (uno::RuntimeException); - virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() + virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); protected: @@ -133,25 +133,25 @@ TestComponent::~TestComponent() LOG_LIFECYCLE_TestComponent_emit(fprintf(stderr, "LIFE: %s -> %p\n", "TestComponent::~TestComponent", this)); } -rtl::OUString SAL_CALL TestComponent::getImplementationName() +rtl::OUString SAL_CALL TestComponent::getImplementationName() throw (uno::RuntimeException) { return m_implName; } -void SAL_CALL TestComponent::acquire() throw () +void SAL_CALL TestComponent::acquire() throw () { - cppu::WeakImplHelper1<lang::XServiceInfo>::acquire(); -} + cppu::WeakImplHelper1<lang::XServiceInfo>::acquire(); +} -void SAL_CALL TestComponent::release() throw () +void SAL_CALL TestComponent::release() throw () { - cppu::WeakImplHelper1<lang::XServiceInfo>::release(); -} + cppu::WeakImplHelper1<lang::XServiceInfo>::release(); +} uno::Any SAL_CALL TestComponent::queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) { - return cppu::WeakImplHelper1<lang::XServiceInfo>::queryInterface(rType); + return cppu::WeakImplHelper1<lang::XServiceInfo>::queryInterface(rType); } sal_Bool SAL_CALL TestComponent::supportsService(rtl::OUString const & ServiceName) @@ -168,14 +168,14 @@ sal_Bool SAL_CALL TestComponent::supportsService(rtl::OUString const & ServiceNa return false; } -uno::Sequence<rtl::OUString> SAL_CALL TestComponent::getSupportedServiceNames() +uno::Sequence<rtl::OUString> SAL_CALL TestComponent::getSupportedServiceNames() throw (uno::RuntimeException) { return getSupportedServiceNames_Static(); } extern "C" sal_Bool SAL_CALL component_writeInfo( - void * /*serviceManager*/, + void * /*serviceManager*/, void * /*registryKey*/ ) { @@ -185,8 +185,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - char const * pImplName, - void * /*serviceManager*/, + char const * pImplName, + void * /*serviceManager*/, void * /*registryKey*/ ) { @@ -213,7 +213,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironmentExt( - sal_Char const ** envTypeName, + sal_Char const ** envTypeName, uno_Environment ** /*ppEnv*/, sal_Char const * pImplName, uno_Environment * /*pSrcEnv*/ @@ -227,7 +227,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviro purpose = rtl::OUStringToOString(cppu::EnvDcp::getPurpose(uImplName), RTL_TEXTENCODING_ASCII_US); } - if (!purpose.getLength()) + if (!purpose.getLength()) { char * pPurpose = getenv("TestComponent.uno"); if (pPurpose) diff --git a/cppuhelper/test/testcmp/TestComponent.hxx b/cppuhelper/test/testcmp/TestComponent.hxx index 92824bd8acb6..7499628148f4 100644 --- a/cppuhelper/test/testcmp/TestComponent.hxx +++ b/cppuhelper/test/testcmp/TestComponent.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/test/testcontainer.cxx b/cppuhelper/test/testcontainer.cxx index ccf9aeda31a7..1dc37b61c596 100644 --- a/cppuhelper/test/testcontainer.cxx +++ b/cppuhelper/test/testcontainer.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 @@ -49,8 +49,8 @@ class TestListener : public WeakImplHelper1< XVetoableChangeListener > { } - - virtual void SAL_CALL vetoableChange( const ::com::sun::star::beans::PropertyChangeEvent& /*aEvent*/ ) + + virtual void SAL_CALL vetoableChange( const ::com::sun::star::beans::PropertyChangeEvent& /*aEvent*/ ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException) { @@ -68,7 +68,7 @@ void test_interfacecontainer() Reference< XVetoableChangeListener > r1 = new TestListener(); Reference< XVetoableChangeListener > r2 = new TestListener(); Reference< XVetoableChangeListener > r3 = new TestListener(); - + helper.addInterface( r1 ); helper.addInterface( r2 ); helper.addInterface( r3 ); @@ -82,7 +82,7 @@ void test_interfacecontainer() Reference< XVetoableChangeListener > r1 = new TestListener(); Reference< XVetoableChangeListener > r2 = new TestListener(); Reference< XVetoableChangeListener > r3 = new TestListener(); - + helper.addInterface( r1 ); helper.addInterface( r2 ); helper.addInterface( r3 ); @@ -91,7 +91,7 @@ void test_interfacecontainer() while( iterator.hasMoreElements() ) ((XVetoableChangeListener*)iterator.next())->vetoableChange( PropertyChangeEvent() ); - + helper.disposeAndClear( EventObject() ); } @@ -101,7 +101,7 @@ void test_interfacecontainer() Reference< XVetoableChangeListener > r1 = new TestListener(); Reference< XVetoableChangeListener > r2 = new TestListener(); Reference< XVetoableChangeListener > r3 = new TestListener(); - + helper.addInterface( r1 ); helper.addInterface( r2 ); helper.addInterface( r3 ); @@ -125,7 +125,7 @@ void test_interfacecontainer() Reference< XVetoableChangeListener > r1 = new TestListener(); Reference< XVetoableChangeListener > r2 = new TestListener(); Reference< XVetoableChangeListener > r3 = new TestListener(); - + helper.addInterface( r1 ); helper.addInterface( r2 ); helper.addInterface( r3 ); @@ -148,7 +148,7 @@ void test_interfacecontainer() OSL_ASSERT( r != r1 && ( r == r2 || r == r3 ) ); } } - + helper.disposeAndClear( EventObject() ); } } diff --git a/cppuhelper/test/testdefaultbootstrapping.cxx b/cppuhelper/test/testdefaultbootstrapping.cxx index 52f1c96af619..fce0a1242a82 100644 --- a/cppuhelper/test/testdefaultbootstrapping.cxx +++ b/cppuhelper/test/testdefaultbootstrapping.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 @@ -59,7 +59,7 @@ SAL_IMPLEMENT_MAIN() OUString arg; rtl_getAppCommandArg(i, &arg.pData); - if (arg.getLength()) + if (arg.getLength()) { Reference<XInterface> xInterface = smgr->createInstance(arg); OString tmp = OUStringToOString(arg, RTL_TEXTENCODING_ASCII_US); diff --git a/cppuhelper/test/testdefaultbootstrapping.pl b/cppuhelper/test/testdefaultbootstrapping.pl index b96ed5c49bcb..c1756e908529 100644 --- a/cppuhelper/test/testdefaultbootstrapping.pl +++ b/cppuhelper/test/testdefaultbootstrapping.pl @@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' #************************************************************************* # # 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 @@ -58,7 +58,7 @@ else { sub extendProgName($) { my $_extension = shift; my $_result; - + if ($ENV{GUI} eq "WNT") { $_result = $progname . $_extension; } @@ -91,7 +91,7 @@ sub testForServices($$$) { my $_testexe = shift; -# my $_rc = system 'echo', $_testexe, @{$_services}, $_pars; +# my $_rc = system 'echo', $_testexe, @{$_services}, $_pars; my $_rc = system $_testexe, @{$_services}, $_pars; return $_rc >> 8; @@ -102,7 +102,7 @@ sub registerService($$){ my $service_lib = shift; my $rdb_name = shift; -# system 'echo', "regcomp -register -r " . $rdb_name . " -c $service_lib"; +# system 'echo', "regcomp -register -r " . $rdb_name . " -c $service_lib"; my $rc = system "regcomp -register -r " . $rdb_name . " -c $service_lib"; @@ -131,21 +131,21 @@ sub registerServices() { $comment = $comment . "\tcouldn't unregister service " . $service . "\n"; $state = 0; } - - + + # register the service and ensure that it is reachable $rc = registerService($services{$service}, $service . '.rdb'); if(!$rc) { $comment = $comment . "\tcouldn't register service " . $service . "\n"; $state = 0; } - + $rc = testForServices([$service], "-env:UNO_SERVICES=" . $service . ".rdb", $testexe); if(!$rc) { $comment = $comment . "\tcouldn't reach service " . $service . "\n"; $state = 0; } - + # memorize all services if (length($allservices_rdbs)) { $allservices_rdbs = $allservices_rdbs . " "; @@ -169,7 +169,7 @@ sub testBeneathExe() { my $service = 'com.sun.star.reflection.CoreReflection'; my $_testexe; - my @_exes = (extendProgName(".exe"), + my @_exes = (extendProgName(".exe"), extendProgName(".Exe"), extendProgName(".bin"), extendProgName(".Bin")); @@ -243,7 +243,7 @@ sub testAllAvailable() { # test that all services are reachable through different rdbs # change the directory to ensure, that all paths become expanded chdir ".."; - + $rc = testForServices(\@allservices, "-env:UNO_SERVICES=" . $allservices_rdbs, $testexe); if (!$rc) { $comment = $comment . "\tmulti rdb test not passed\n"; diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx index faa83b92fb24..623585299c76 100644 --- a/cppuhelper/test/testhelper.cxx +++ b/cppuhelper/test/testhelper.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 @@ -77,14 +77,14 @@ SAL_IMPLEMENT_MAIN() Reference< beans::XPropertySet >( xContext->getServiceManager(), UNO_QUERY )->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) != xInitialContext ); - + Reference< XMultiServiceFactory > x( xMgr, UNO_QUERY ); test_ImplHelper( x ); testPropertyTypeHelper(); testidlclass( x ); test_PropertySetHelper(); test_interfacecontainer(); - + OSL_VERIFY( xContext->getValueByName( OUString( RTL_CONSTASCII_USTRINGPARAM("bla, bla") ) ) == (sal_Int32)5 ); OSL_VERIFY( ! xInitialContext->getValueByName( @@ -99,7 +99,7 @@ SAL_IMPLEMENT_MAIN() OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); OSL_ENSURE( ! "exception occured: ", cstr_msg.getStr() ); } - + printf( "Test finished\n" ); return 0; } diff --git a/cppuhelper/test/testhelper.hxx b/cppuhelper/test/testhelper.hxx index c40d738d83ba..a164c1c6b9f4 100644 --- a/cppuhelper/test/testhelper.hxx +++ b/cppuhelper/test/testhelper.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/test/testidlclass.cxx b/cppuhelper/test/testidlclass.cxx index fca2a64089f8..48ee84ed9101 100644 --- a/cppuhelper/test/testidlclass.cxx +++ b/cppuhelper/test/testidlclass.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 @@ -101,11 +101,11 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr) //TODO ! // one idl class for one interface // this test fails, if core reflection fails ! -// OSL_ASSERT( 1 == seqIdlClass.getLength() ); -// Reference < XIdlClass > rIdlInterface = seqIdlClass.getArray()[0]; +// OSL_ASSERT( 1 == seqIdlClass.getLength() ); +// Reference < XIdlClass > rIdlInterface = seqIdlClass.getArray()[0]; // check for IdlClass interface returned by Core Reflection -// OSL_ASSERT( rIdlInterface.is() ); +// OSL_ASSERT( rIdlInterface.is() ); diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx index 703c44ebebbb..b3c2638739c3 100644 --- a/cppuhelper/test/testimplhelper.cxx +++ b/cppuhelper/test/testimplhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ using namespace com::sun::star::uno; struct TestImpl : public ImplHelper4< CA, DBA, FE, G > { sal_Int32 nRef; - + virtual ~TestImpl() { OSL_TRACE( "> TestImpl dtor called... <\n" ); } @@ -101,7 +101,7 @@ struct TestImpl : public ImplHelper4< CA, DBA, FE, G > { ++nRef; } virtual void SAL_CALL release( ) throw() { if (! --nRef) delete this; } - + // A virtual OUString SAL_CALL a() throw(RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } @@ -130,7 +130,7 @@ struct TestWeakAggImpl : public WeakAggImplHelper4< CA, DBA, FE, G > { virtual ~TestWeakAggImpl() { OSL_TRACE( "> TestWeakAggImpl dtor called... <\n" ); } - + // A virtual OUString SAL_CALL a() throw(RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } @@ -161,7 +161,7 @@ struct TestWeakImpl : public WeakImplHelper4< CA, DBA, FE, G > virtual ~TestWeakImpl() { OSL_TRACE( "> TestWeakImpl dtor called... <\n" ); } - + // A virtual OUString SAL_CALL a() throw(RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } @@ -210,7 +210,7 @@ struct TestWeakComponentImpl : public WeakComponentImplHelper4< CA, DBA, FE, G > void SAL_CALL disposing() { OSL_TRACE( "> TestWeakComponentImpl disposing called... <\n" ); } - + // A virtual OUString SAL_CALL a() throw(RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } @@ -246,7 +246,7 @@ struct TestWeakAggComponentImpl : public WeakAggComponentImplHelper4< CA, DBA, F void SAL_CALL disposing() { OSL_TRACE( "> TestWeakAggComponentImpl disposing called... <\n" ); } - + // A virtual OUString SAL_CALL a() throw(RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); } @@ -295,7 +295,7 @@ struct TestImplInh : public ImplInheritanceHelper2< TestWeakImpl, H, I > virtual ~TestImplInh() { OSL_TRACE( "> TestWeakImplInh dtor called... <\n" ); } - + // H virtual OUString SAL_CALL h() throw(RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM("h") ); } @@ -309,7 +309,7 @@ struct TestAggImplInh : public AggImplInheritanceHelper2< TestWeakAggImpl, H, I { virtual ~TestAggImplInh() { OSL_TRACE( "> TestAggImplInh dtor called... <\n" ); } - + // H virtual OUString SAL_CALL h() throw(RuntimeException) { return OUString( RTL_CONSTASCII_USTRINGPARAM("h2") ); } @@ -348,7 +348,7 @@ static void dotest( const Reference< XInterface > & xOriginal ) { ::fprintf( stderr, n < 15 ? "%x " : "%x \n", id[ n ] ); } - + Reference< A > xa( xOriginal, UNO_QUERY ); OSL_ENSURE( xa->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### A failed!" ); Reference< BA > xba( xa, UNO_QUERY ); @@ -372,14 +372,14 @@ static void dotest( const Reference< XInterface > & xOriginal ) // type provider Reference< lang::XTypeProvider > xProv( xg, UNO_QUERY ); Sequence< Type > aTypes( xProv->getTypes() ); - + // CA, DBA, FE, G, XTypeProvider OSL_ASSERT( isIn( aTypes, "test.CA" ) ); OSL_ASSERT( isIn( aTypes, "test.DBA" ) ); OSL_ASSERT( isIn( aTypes, "test.FE") ); OSL_ASSERT( isIn( aTypes, "test.G") ); OSL_ASSERT( isIn( aTypes, "com.sun.star.lang.XTypeProvider") ); - + Reference< XWeak > xWeak( xg, UNO_QUERY ); if (xWeak.is()) { @@ -390,7 +390,7 @@ static void dotest( const Reference< XInterface > & xOriginal ) { OSL_ASSERT( isIn( aTypes, "com.sun.star.lang.XComponent") ); } - + Reference< XAggregation > xAgg( xg, UNO_QUERY ); if (xAgg.is()) { @@ -406,7 +406,7 @@ static void dotest( const Reference< XInterface > & xOriginal ) { OSL_ASSERT( isIn( aTypes, "test.I") ); } - + OSL_ENSURE( xg == xOriginal, "### root!" ); } @@ -455,7 +455,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) xTP3->getImplementationId() != xTP5->getImplementationId() && xTP4->getImplementationId() != xTP5->getImplementationId() ); // - + dotest( xImpl ); dotest( xWeakImpl ); dotest( xWeakAggImpl ); @@ -469,7 +469,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) Reference< I > xI( xH, UNO_QUERY ); OSL_ASSERT( xH->h().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("h") ) ); OSL_ASSERT( xI->i().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("i") ) ); - + xWeakAggImpl = (OWeakObject *)new TestAggImplInh(); Reference< lang::XTypeProvider > xTP7( xWeakAggImpl, UNO_QUERY ); dotest( xWeakAggImpl ); @@ -506,7 +506,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) { Any a( getCaughtException() ); OSL_ASSERT( a == exc ); - + try { throwException( a ); @@ -514,7 +514,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) catch (lang::IllegalAccessException & e) { OSL_ASSERT( exc.Message == e.Message && exc.Context == e.Context ); - + try { throw_one( exc ); @@ -538,7 +538,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) } } OSL_ASSERT( exc_succ ); - + try { throwException( makeAny( RuntimeException( diff --git a/cppuhelper/test/testlib/UNO.pm b/cppuhelper/test/testlib/UNO.pm index 0bc7b27fc86a..052a9ea986d3 100644 --- a/cppuhelper/test/testlib/UNO.pm +++ b/cppuhelper/test/testlib/UNO.pm @@ -13,17 +13,17 @@ our @ISA = qw(Exporter DynaLoader); # names by default without a very good reason. Use EXPORT_OK instead. # Do not simply export all your public functions/methods/constants. -# This allows declaration use UNO ':all'; +# This allows declaration use UNO ':all'; # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK # will save memory. our %EXPORT_TAGS = ( 'all' => [ qw( - + ) ] ); our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } ); our @EXPORT = qw( - + ); our $VERSION = '0.01'; diff --git a/cppuhelper/test/testlib/defbootstrap_lib.cxx b/cppuhelper/test/testlib/defbootstrap_lib.cxx index 22a4c5d865a4..64c28766a5f3 100644 --- a/cppuhelper/test/testlib/defbootstrap_lib.cxx +++ b/cppuhelper/test/testlib/defbootstrap_lib.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 @@ -94,7 +94,7 @@ XS(XS_UNO_tryService) Perl_croak(aTHX_ "Usage: UNO::tryService(input)"); { const char * input = (const char *)SvPV(ST(0),PL_na); - int RETVAL; + int RETVAL; dXSTARG; RETVAL = tryService(input); diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index ebea7d09289d..94b1401e35e7 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.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 @@ -68,17 +68,17 @@ static Property * getPropertyTable1() if( ! pTable ) { static Property aTable[] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString *)0) , + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString *)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //OUString - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ) , + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //Char - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0) , + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //sal_Int32 - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) , + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //double - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() , + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //BOOL - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any*)0) , + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) //Any }; pTable = aTable; @@ -97,18 +97,18 @@ static Property * getPropertyTable2() if( ! pTable ) { static Property aTable[] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0) , - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Any - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) , - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Double - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0), - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // sal_Int32 - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() , - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Bool + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0) , + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Any + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) , + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Double + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0), + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // sal_Int32 + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() , + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Bool }; pTable = aTable; } @@ -125,12 +125,12 @@ static Property * getPropertyTable3() if( ! pTable ) { static Property aTable[] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0) , - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // any - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // OUString + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0) , + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // any + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // OUString }; pTable = aTable; } @@ -148,12 +148,12 @@ static Property * getPropertyTable4() if( ! pTable ) { static Property aTable[] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 2, getCppuType( (Any *)0) , - PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Any + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 2, getCppuType( (Any *)0) , + PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Any }; pTable = aTable; } @@ -181,9 +181,9 @@ void test_PropertyArrayHelper() OSL_ENSURE( 6 == aProps.getLength(), "getProperties() gives not all properties" ); for( int i = 0; i < 6; i++ ) { - OSL_ENSURE( pP[i].Name == getPropertyTable1()[i].Name , "Name not correct" ); - OSL_ENSURE( pP[i].Handle == getPropertyTable1()[i].Handle, "Handle not correct" ); - OSL_ENSURE( pP[i].Attributes == getPropertyTable1()[i].Attributes, "Attributes not correct" ); + OSL_ENSURE( pP[i].Name == getPropertyTable1()[i].Name , "Name not correct" ); + OSL_ENSURE( pP[i].Handle == getPropertyTable1()[i].Handle, "Handle not correct" ); + OSL_ENSURE( pP[i].Attributes == getPropertyTable1()[i].Attributes, "Attributes not correct" ); OSL_ENSURE( pP[i].Type == getPropertyTable1()[i].Type, "Type not correct" ); } } @@ -258,14 +258,14 @@ void test_PropertyArrayHelper() sal_Int32 Handle = a1.getHandleByName( OUString( RTL_CONSTASCII_USTRINGPARAM("asdaf") ) ); OSL_ENSURE( Handle == -1, "Handle not correct" ); } - + // Test fillPropertyMembersByHandle { OPropertyArrayHelper a1( getPropertyTable1(), 6 ); int i; for( i = 0; i < 6; i++ ) { - sal_Int16 nAttributes; + sal_Int16 nAttributes; OUString aPropName; sal_Bool b = a1.fillPropertyMembersByHandle( &aPropName, &nAttributes, getPropertyTable1()[i].Handle ); OSL_ENSURE( b, "fillPropertyMembersByHandle: handle not found" ); @@ -277,7 +277,7 @@ void test_PropertyArrayHelper() OPropertyArrayHelper a4( getPropertyTable4(), 3 ); for( i = 0; i < 3; i++ ) { - sal_Int16 nAttributes; + sal_Int16 nAttributes; OUString aPropName; sal_Bool b = a1.fillPropertyMembersByHandle( &aPropName, &nAttributes, getPropertyTable4()[i].Handle ); OSL_ENSURE( b, "fillPropertyMembersByHandle: handle not found" ); @@ -310,28 +310,28 @@ void test_PropertyArrayHelper() //---------------------------------------------------- -// test_OPropertySetHelper +// test_OPropertySetHelper //---------------------------------------------------- struct MutexContainer { Mutex aMutex; }; -class test_OPropertySetHelper : +class test_OPropertySetHelper : public MutexContainer, - public OBroadcastHelper , + public OBroadcastHelper , public OPropertySetHelper, public OWeakObject { public: - test_OPropertySetHelper( Property * p, sal_Int32 n ) - : MutexContainer() + test_OPropertySetHelper( Property * p, sal_Int32 n ) + : MutexContainer() , OBroadcastHelper( ((MutexContainer *)this)->aMutex ) -// , OPropertySetHelper( *SAL_STATIC_CAST(OBroadcastHelper *,this)) - // MSCI 4 bug ! : - // OBroadcastHelper == OBroadcastHelperVar<OMultiTypeInterfaceContainerHelper> - , OPropertySetHelper( - *SAL_STATIC_CAST(OBroadcastHelper *,this)) +// , OPropertySetHelper( *SAL_STATIC_CAST(OBroadcastHelper *,this)) + // MSCI 4 bug ! : + // OBroadcastHelper == OBroadcastHelperVar<OMultiTypeInterfaceContainerHelper> + , OPropertySetHelper( + *SAL_STATIC_CAST(OBroadcastHelper *,this)) , bBOOL( sal_False ) , nINT16( 0 ) , nINT32( 0 ) @@ -339,7 +339,7 @@ public: , nPropCount( n ) { } - + ~test_OPropertySetHelper() { @@ -362,7 +362,7 @@ public: disposing(); EventObject aEvt; aEvt.Source = Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * ,this) ); - + rBHelper.aLC.disposeAndClear( aEvt ); rBHelper.bDisposed = sal_True; rBHelper.bInDispose = sal_False; @@ -370,14 +370,14 @@ public: } // XInterface - Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(RuntimeException) - { + Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(RuntimeException) + { Any aRet( OPropertySetHelper::queryInterface( rType ) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } - void SAL_CALL acquire() throw() + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() + void SAL_CALL release() throw() { OWeakObject::release(); } // XPropertySet @@ -385,15 +385,15 @@ public: using OPropertySetHelper::getFastPropertyValue; - sal_Bool bBOOL; - sal_Int16 nINT16; - sal_Int32 nINT32; + sal_Bool bBOOL; + sal_Int16 nINT16; + sal_Int32 nINT32; Property * pBasicProps; - sal_Int32 nPropCount; + sal_Int32 nPropCount; protected: IPropertyArrayHelper & SAL_CALL getInfoHelper() throw(RuntimeException); sal_Bool SAL_CALL convertFastPropertyValue( - Any & rConvertedValue, Any & rOldValue, + Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw(IllegalArgumentException); void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(RuntimeException); @@ -404,12 +404,12 @@ protected: //------ The Properties of this implementation ------------------------- //---------------------------------------------------------------------- // Id must be the index into the array -#define PROPERTY_BOOL 0 -#define PROPERTY_INT16 1 -#define PROPERTY_INT32 2 +#define PROPERTY_BOOL 0 +#define PROPERTY_INT16 1 +#define PROPERTY_INT32 2 // Max number of properties -#define PROPERTY_COUNT 4 +#define PROPERTY_COUNT 4 // Names of Properties /** * All Properties of this implementation. Must be sorted by name. @@ -424,11 +424,11 @@ Property * getBasicProps() static Property aBasicProps[PROPERTY_COUNT] = { - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ) , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ), - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , PROPERTY_INT16, - getCppuType( (sal_Int16*)0 ), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ), - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) , PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ), - Property( OUString( RTL_CONSTASCII_USTRINGPARAM("TEST") ) , 55 , getCppuType( (sal_Int32*)0), PropertyAttribute::BOUND ) + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ) , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ), + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , PROPERTY_INT16, + getCppuType( (sal_Int16*)0 ), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ), + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) , PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ), + Property( OUString( RTL_CONSTASCII_USTRINGPARAM("TEST") ) , 55 , getCppuType( (sal_Int32*)0), PropertyAttribute::BOUND ) }; pTable = aBasicProps; } @@ -438,17 +438,17 @@ Property * getBasicProps() //---------------------------------------------------- -// test_OPropertySetHelper_Listener +// test_OPropertySetHelper_Listener //---------------------------------------------------- class test_OPropertySetHelper_Listener : public WeakImplHelper3< XPropertyChangeListener, XPropertiesChangeListener, XVetoableChangeListener > { public: - sal_Int32 nDisposing; - Mutex aMutex; - Any * pExceptedListenerValues; - sal_Int32 nCount; - sal_Int32 nCurrent; + sal_Int32 nDisposing; + Mutex aMutex; + Any * pExceptedListenerValues; + sal_Int32 nCount; + sal_Int32 nCurrent; test_OPropertySetHelper_Listener( Any * p = 0, sal_Int32 n = 0 ) : nDisposing( 0 ) @@ -460,19 +460,19 @@ public: ~test_OPropertySetHelper_Listener() { } - - sal_Int32 getRefCount() + + sal_Int32 getRefCount() { return m_refCount; } // XEventListener - void SAL_CALL disposing(const EventObject& /*evt*/) throw ( RuntimeException) + void SAL_CALL disposing(const EventObject& /*evt*/) throw ( RuntimeException) { MutexGuard aGuard( aMutex ); nDisposing++; } // XPropertyChangeListener - void SAL_CALL propertyChange(const PropertyChangeEvent& evt) throw (RuntimeException) + void SAL_CALL propertyChange(const PropertyChangeEvent& evt) throw (RuntimeException) { if( !pExceptedListenerValues ) return; @@ -483,7 +483,7 @@ public: { case PROPERTY_BOOL: { - OSL_ENSURE( sal_False , "PropertySetHelper: BOOL cannot change" ); + OSL_ENSURE( sal_False , "PropertySetHelper: BOOL cannot change" ); OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" ); } break; @@ -491,35 +491,35 @@ public: case PROPERTY_INT16: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" ); - + OSL_ENSURE( pExceptedListenerValues[nCurrent].getValueType().getTypeClass() == TypeClass_SHORT , "PropertySetHelper: wrong data type" ); - + sal_Int16 nInt16, nOldInt16; - pExceptedListenerValues[nCurrent] >>= nInt16; - evt.OldValue >>= nOldInt16; + pExceptedListenerValues[nCurrent] >>= nInt16; + evt.OldValue >>= nOldInt16; OSL_ENSURE( nInt16 == nOldInt16, "PropertySetHelper: wrong old value" ); - + pExceptedListenerValues[nCurrent+1] >>= nInt16; - evt.NewValue >>= nOldInt16; - OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong new value" ); + evt.NewValue >>= nOldInt16; + OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong new value" ); } break; case PROPERTY_INT32: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); - - sal_Int32 nInt32,nOldInt32; - + + sal_Int32 nInt32,nOldInt32; + pExceptedListenerValues[nCurrent] >>= nInt32; evt.OldValue >>= nOldInt32; - OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" ); - + OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" ); + pExceptedListenerValues[nCurrent+1] >>= nInt32; evt.NewValue >>= nOldInt32; - OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong new value" ); + OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong new value" ); } break; @@ -541,7 +541,7 @@ public: { case PROPERTY_BOOL: { - OSL_ENSURE( sal_False , "PropertySetHelper: BOOL cannot change" ); + OSL_ENSURE( sal_False , "PropertySetHelper: BOOL cannot change" ); OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" ); } break; @@ -549,17 +549,17 @@ public: case PROPERTY_INT16: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" ); - + sal_Int16 nInt16, nOldInt16; - pExceptedListenerValues[nCurrent] >>= nInt16; - evt.OldValue >>= nOldInt16; - + pExceptedListenerValues[nCurrent] >>= nInt16; + evt.OldValue >>= nOldInt16; + OSL_ENSURE( nInt16 == nOldInt16,"PropertySetHelper: wrong old value" ); - - pExceptedListenerValues[nCurrent+1] >>= nInt16; - evt.NewValue >>= nOldInt16; - OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong new value" ); - + + pExceptedListenerValues[nCurrent+1] >>= nInt16; + evt.NewValue >>= nOldInt16; + OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong new value" ); + if( nOldInt16 == 100 ) { nCurrent += 2; @@ -571,12 +571,12 @@ public: case PROPERTY_INT32: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); - - sal_Int32 nInt32,nOldInt32; + + sal_Int32 nInt32,nOldInt32; pExceptedListenerValues[nCurrent] >>= nInt32; evt.OldValue >>= nOldInt32; OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" ); - + pExceptedListenerValues[nCurrent+1] >>= nInt32; evt.NewValue >>= nOldInt32; OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong new value" ); @@ -614,13 +614,13 @@ public: OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" ); sal_Int16 nInt16, nOldInt16; - pExceptedListenerValues[nCurrent] >>= nInt16; - evt.OldValue >>= nOldInt16; + pExceptedListenerValues[nCurrent] >>= nInt16; + evt.OldValue >>= nOldInt16; OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong old value" ); - - pExceptedListenerValues[nCurrent+1] >>= nInt16; - evt.NewValue >>= nOldInt16; + + pExceptedListenerValues[nCurrent+1] >>= nInt16; + evt.NewValue >>= nOldInt16; OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong new value" ); } break; @@ -629,15 +629,15 @@ public: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); - - sal_Int32 nInt32,nOldInt32; + + sal_Int32 nInt32,nOldInt32; pExceptedListenerValues[nCurrent] >>= nInt32; evt.OldValue >>= nOldInt32; OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" ); - + pExceptedListenerValues[nCurrent+1] >>= nInt32; evt.NewValue >>= nOldInt32; - OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong new value" ); + OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong new value" ); } break; @@ -671,9 +671,9 @@ Reference < XPropertySetInfo > test_OPropertySetHelper::getPropertySetInfo() // Return sal_True, value changed sal_Bool test_OPropertySetHelper::convertFastPropertyValue ( - Any & rConvertedValue, - Any & rOldValue, - sal_Int32 nHandle, + Any & rConvertedValue, + Any & rOldValue, + sal_Int32 nHandle, const Any& rValue )throw(IllegalArgumentException) { @@ -684,8 +684,8 @@ sal_Bool test_OPropertySetHelper::convertFastPropertyValue sal_Bool b; convertPropertyValue( b , rValue ); if( b != bBOOL ) - { - + { + rConvertedValue.setValue( &b , ::getCppuBooleanType() ); rOldValue.setValue( & bBOOL , ::getCppuBooleanType() ); return sal_True; @@ -698,11 +698,11 @@ sal_Bool test_OPropertySetHelper::convertFastPropertyValue { sal_Int16 n16; convertPropertyValue( n16 , rValue ); - + if( n16 != nINT16 ) { - rConvertedValue <<= n16; - rOldValue <<= nINT16; + rConvertedValue <<= n16; + rOldValue <<= nINT16; return sal_True; } else @@ -716,7 +716,7 @@ sal_Bool test_OPropertySetHelper::convertFastPropertyValue if( n32 != nINT32 ) { rConvertedValue <<= n32; - rOldValue <<= nINT32; + rOldValue <<= nINT32; return sal_True; } else @@ -729,12 +729,12 @@ sal_Bool test_OPropertySetHelper::convertFastPropertyValue } } -/** +/** * only set the value. */ void test_OPropertySetHelper::setFastPropertyValue_NoBroadcast ( - sal_Int32 nHandle, + sal_Int32 nHandle, const Any& rValue )throw(RuntimeException) { @@ -802,24 +802,24 @@ void test_PropertySetHelper() // first test getBasicProps() Handles are { 0, 1, 2 } xPS = pPS = new test_OPropertySetHelper( getBasicProps(), PROPERTY_COUNT - z ); xPS_L = static_cast< XPropertyChangeListener * >( pPS_L = new test_OPropertySetHelper_Listener() ); - + // Test queryInterface Reference < XPropertySet > rProp( xPS , UNO_QUERY ); OSL_ENSURE( rProp.is() , "PropertySetHelper: XPropertySet nor supported" ); - + Reference < XMultiPropertySet > rMulti( xPS , UNO_QUERY ); OSL_ENSURE( rMulti.is() , "PropertySetHelper: XMultiPropertySet nor supported" ); - + Reference < XFastPropertySet > rFast( xPS , UNO_QUERY ); OSL_ENSURE( rFast.is() , "PropertySetHelper: XFastPropertySet nor supported" ); x = Reference < XInterface > (); - + // Test add-remove listener { - Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY ); - Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); - + Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY ); + Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); + xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); Sequence<OUString> szPN( 3 ); szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ); @@ -830,7 +830,7 @@ void test_PropertySetHelper() szPN = Sequence<OUString>(); pPS->addPropertiesChangeListener( szPN, x1 ); pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); - + xPS->removePropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); pPS->removePropertiesChangeListener( x1 ); pPS->removePropertiesChangeListener( x1 ); @@ -844,9 +844,9 @@ void test_PropertySetHelper() } catch( UnknownPropertyException & /*e*/ ) { - + } - + try { xPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), x2 ); @@ -854,17 +854,17 @@ void test_PropertySetHelper() } catch( UnknownPropertyException & /*e*/ ) { - + } - + } OSL_ENSURE( pPS_L->getRefCount() == 1, "PropertySetHelper: wrong reference count" ); - + // Test disposing { Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY ); - Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); - + Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); + xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); Sequence<OUString> szPN( 2 ); szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ); @@ -875,11 +875,11 @@ void test_PropertySetHelper() pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); pPS->dispose(); } - OSL_ENSURE( pPS_L->nDisposing == 4 , "PropertySetHelper: wrong disposing count" ); - OSL_ENSURE( pPS_L->getRefCount() == 1 , "PropertySetHelper: wrong reference count" ); + OSL_ENSURE( pPS_L->nDisposing == 4 , "PropertySetHelper: wrong disposing count" ); + OSL_ENSURE( pPS_L->getRefCount() == 1 , "PropertySetHelper: wrong reference count" ); pPS_L->nDisposing = 0; xPS = pPS = new test_OPropertySetHelper( getBasicProps(), PROPERTY_COUNT - z ); - + // Test set- and get- (Fast) propertyValue { // set read only property @@ -909,7 +909,7 @@ void test_PropertySetHelper() catch( PropertyVetoException & /*e*/ ) { } - + // set unknown property try { @@ -934,7 +934,7 @@ void test_PropertySetHelper() catch( UnknownPropertyException & /*e*/ ) { } - + // get unknown property try { @@ -945,8 +945,8 @@ void test_PropertySetHelper() catch( UnknownPropertyException & /*e*/ ) { } - - try + + try { Any aBool; aBool = ((XFastPropertySet *)pPS)->getFastPropertyValue( 3 ); @@ -955,7 +955,7 @@ void test_PropertySetHelper() catch( UnknownPropertyException & /*e*/ ) { } - + // set property with invalid type try { @@ -976,7 +976,7 @@ void test_PropertySetHelper() catch( IllegalArgumentException & /*e*/ ) { } - + // narrowing conversion is not allowed! try { @@ -1001,7 +1001,7 @@ void test_PropertySetHelper() { } - + Any aValue; aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ) ); sal_Bool b = *( (sal_Bool*)aValue.getValue()); @@ -1010,7 +1010,7 @@ void test_PropertySetHelper() b = *((sal_Bool*)aValue.getValue()); OSL_ENSURE( !b, "PropertySetHelper: wrong BOOL value" ); - + sal_Int16 n16; aValue <<=(sal_Int16)22; xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue ); @@ -1023,7 +1023,7 @@ void test_PropertySetHelper() aValue = ((XFastPropertySet *)pPS)->getFastPropertyValue( PROPERTY_INT16 ); aValue >>= n16; OSL_ENSURE( 44 == n16, "PropertySetHelper: wrong INT16 value" ); - + // widening conversion aValue <<= (sal_Int16)55; xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aValue ); @@ -1036,28 +1036,28 @@ void test_PropertySetHelper() aValue = ((XFastPropertySet *)pPS)->getFastPropertyValue( PROPERTY_INT32 ); aValue >>= n32; OSL_ENSURE( 66 == n32, "PropertySetHelper: wrong INT32 value" ); - + Sequence< OUString >valueNames = Sequence<OUString>( 3 ); valueNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ); valueNames.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); valueNames.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ); Sequence< Any > aValues = pPS->getPropertyValues( valueNames ); - + b = *((sal_Bool*)aValues.getConstArray()[0].getValue()); aValues.getConstArray()[1] >>= n16; aValues.getConstArray()[2] >>= n32; - + OSL_ENSURE( !b, "PropertySetHelper: wrong BOOL value" ); OSL_ENSURE( 44 == n16, "PropertySetHelper: wrong INT16 value" ); OSL_ENSURE( 66 == n32, "PropertySetHelper: wrong INT32 value" ); } pPS->nINT32 = 0; pPS->nINT16 = 0; - + // Test add-remove listener { Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); - + xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); @@ -1067,17 +1067,17 @@ void test_PropertySetHelper() pPS_L->pExceptedListenerValues = aSeq.getArray(); - pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value vetoable - pPS_L->pExceptedListenerValues[1] <<= (sal_Int16) 22; // new value vetoable - pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value bound - pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 22; // new value bound - pPS_L->pExceptedListenerValues[4] <<= (sal_Int16) 22; // old value vetoable - pPS_L->pExceptedListenerValues[5] <<= (sal_Int16) 44; // new value vetoable - pPS_L->pExceptedListenerValues[6] <<= (sal_Int16) 22; // old value bound - pPS_L->pExceptedListenerValues[7] <<= (sal_Int16) 44; // new value bound - pPS_L->pExceptedListenerValues[8] <<= (sal_Int16) 44; // old value vetoable - pPS_L->pExceptedListenerValues[9] <<= (sal_Int16) 100; // new value vetoable exception - + pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value vetoable + pPS_L->pExceptedListenerValues[1] <<= (sal_Int16) 22; // new value vetoable + pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value bound + pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 22; // new value bound + pPS_L->pExceptedListenerValues[4] <<= (sal_Int16) 22; // old value vetoable + pPS_L->pExceptedListenerValues[5] <<= (sal_Int16) 44; // new value vetoable + pPS_L->pExceptedListenerValues[6] <<= (sal_Int16) 22; // old value bound + pPS_L->pExceptedListenerValues[7] <<= (sal_Int16) 44; // new value bound + pPS_L->pExceptedListenerValues[8] <<= (sal_Int16) 44; // old value vetoable + pPS_L->pExceptedListenerValues[9] <<= (sal_Int16) 100; // new value vetoable exception + Any aValue; aValue <<= (sal_Int16)22; xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue ); @@ -1103,12 +1103,12 @@ void test_PropertySetHelper() xPS->removePropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L ); pPS->removeVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 ); } - + // Test multi property set listener { Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY ); Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY ); - + pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , x2 ); Sequence<OUString> szPN( 4 ); szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ); @@ -1116,19 +1116,19 @@ void test_PropertySetHelper() szPN.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ); // must ne ignored by the addPropertiesChangeListener method szPN.getArray()[3] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); pPS->addPropertiesChangeListener( szPN, x1 ); - + pPS_L->nCount = 6; Sequence< Any > aSeq( pPS_L->nCount ); pPS_L->nCurrent = 0; pPS_L->pExceptedListenerValues = aSeq.getArray(); - pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value vetoable - pPS_L->pExceptedListenerValues[1] <<= (sal_Int16 ) 22; // new value vetoable + pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value vetoable + pPS_L->pExceptedListenerValues[1] <<= (sal_Int16 ) 22; // new value vetoable // INT32 is not constrained - pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value bound - pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 22; // new value bound - pPS_L->pExceptedListenerValues[4] <<= (sal_Int32) 0; // old value bound - pPS_L->pExceptedListenerValues[5] <<= (sal_Int32) 44; // new value bound - + pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value bound + pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 22; // new value bound + pPS_L->pExceptedListenerValues[4] <<= (sal_Int32) 0; // old value bound + pPS_L->pExceptedListenerValues[5] <<= (sal_Int32) 44; // new value bound + szPN = Sequence<OUString>( 2 ); szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ); @@ -1137,7 +1137,7 @@ void test_PropertySetHelper() aValues.getArray()[1] <<= (sal_Int16) 44; pPS->setPropertyValues( szPN, aValues ); OSL_ENSURE( pPS_L->nCount == pPS_L->nCurrent, "not all listeners called" ); - + //firePropertiesChangeEvent pPS->nINT16 = 8; pPS->nINT32 = 5; @@ -1149,20 +1149,20 @@ void test_PropertySetHelper() pPS_L->pExceptedListenerValues[3] <<= (sal_Int32) 5; // new value pPS->firePropertiesChangeEvent( szPN, pPS_L ); OSL_ENSURE( pPS_L->nCount == pPS_L->nCurrent, "not all listeners called" ); - - - //vetoable exception with multible + + + //vetoable exception with multible szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ); pPS->nINT32 = 0; pPS->nINT16 = 0; pPS_L->nCount = 4; pPS_L->nCurrent = 0; - pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value vetoable - pPS_L->pExceptedListenerValues[1] <<= (sal_Int16) 44; // new value vetoable - pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value vetoable - pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 100; // new value vetoable - + pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value vetoable + pPS_L->pExceptedListenerValues[1] <<= (sal_Int16) 44; // new value vetoable + pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value vetoable + pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 100; // new value vetoable + try { aValues.getArray()[0] <<= (sal_Int16)44; diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx index 852fa33ba09f..d913c7879b60 100644 --- a/cppuhelper/test/testproptyphlp.cxx +++ b/cppuhelper/test/testproptyphlp.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/unotypes/cppuhelper/detail/XExceptionThrower.idl b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl index eb328c1d8983..371a4e358c54 100644 --- a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl +++ b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |