diff options
Diffstat (limited to 'comphelper')
219 files changed, 1800 insertions, 1800 deletions
diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/comphelper/inc/comphelper/ChainablePropertySet.hxx index 1b11005a42c2..ed090799b5be 100644 --- a/comphelper/inc/comphelper/ChainablePropertySet.hxx +++ b/comphelper/inc/comphelper/ChainablePropertySet.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,8 +35,8 @@ #include <comphelper/PropertyInfoHash.hxx> #include "comphelper/comphelperdllapi.h" -namespace comphelper -{ +namespace comphelper +{ class ChainablePropertySetInfo; } @@ -50,19 +50,19 @@ namespace comphelper * To be used as a base class for PropertySets, the subclass must implement * the 6 protected pure virtual functions. If a mutex is passed to the * constructor, this is locked before any call to _getSingleValue or - * _setSingleValue and released after all processing has completed + * _setSingleValue and released after all processing has completed * (including _postSetValues or _postGetValues ) - * - * The implementations of getPropertyValues/setPropertyValues call + * + * The implementations of getPropertyValues/setPropertyValues call * lockMutex and _preGetValues/_preSetValues once before calling * _getSingleValue/_setSingleValue for each property. After each * property has been dealt with, _postGetValues/_postSetValues * are called once. * - * Any MasterPropertySet implementations that can include an - * implementation of a given ChainablePropertySet must be + * Any MasterPropertySet implementations that can include an + * implementation of a given ChainablePropertySet must be * declared as a 'friend' in the implementation of the ChainablePropertySet. - * + * */ namespace comphelper @@ -81,72 +81,72 @@ namespace comphelper virtual void _preSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) + virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; virtual void _postSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; virtual void _preGetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) + virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) = 0; virtual void _postGetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; virtual void _preGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) + virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException ); virtual void _postGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) + virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) + virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, osl::SolarMutex* pMutex = NULL ) throw(); - virtual ~ChainablePropertySet() + virtual ~ChainablePropertySet() throw(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 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); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx index c7e1e88f260e..20bb61a59909 100644 --- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx +++ b/comphelper/inc/comphelper/ChainablePropertySetInfo.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 <comphelper/TypeGeneration.hxx> #include "comphelper/comphelperdllapi.h" -/* +/* * A ChainablePropertySetInfo is usually initialised with a pointer to the first element * of a null-terminated static table of PropertyInfo structs. This is placed in a hash_map * for fast access @@ -53,25 +53,25 @@ namespace comphelper PropertyInfoHash maMap; com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; public: - ChainablePropertySetInfo() + ChainablePropertySetInfo() throw(); - ChainablePropertySetInfo( PropertyInfo * pMap ) + ChainablePropertySetInfo( PropertyInfo * pMap ) throw(); - virtual ~ChainablePropertySetInfo() + virtual ~ChainablePropertySetInfo() throw(); - void add( PropertyInfo* pMap, sal_Int32 nCount = -1 ) + void add( PropertyInfo* pMap, sal_Int32 nCount = -1 ) throw(); - void remove( const rtl::OUString& aName ) + void remove( const rtl::OUString& aName ) throw(); // XPropertySetInfo - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) + virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; } diff --git a/comphelper/inc/comphelper/IdPropArrayHelper.hxx b/comphelper/inc/comphelper/IdPropArrayHelper.hxx index a624ba7b2f5a..f21d14af1f65 100644 --- a/comphelper/inc/comphelper/IdPropArrayHelper.hxx +++ b/comphelper/inc/comphelper/IdPropArrayHelper.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 @@ -43,7 +43,7 @@ namespace comphelper //************************************************************ // OIdPropertyArrayUsageHelper //************************************************************ - template <typename TYPE> struct OIdPropertyArrayUsageHelperMutex + template <typename TYPE> struct OIdPropertyArrayUsageHelperMutex : public rtl::Static< ::osl::Mutex, OIdPropertyArrayUsageHelperMutex<TYPE> > {}; typedef std::map< sal_Int32, ::cppu::IPropertyArrayHelper*, std::less< sal_Int32 > > OIdPropertyArrayMap; @@ -51,8 +51,8 @@ namespace comphelper class OIdPropertyArrayUsageHelper { protected: - static sal_Int32 s_nRefCount; - static OIdPropertyArrayMap* s_pMap; + static sal_Int32 s_nRefCount; + static OIdPropertyArrayMap* s_pMap; public: OIdPropertyArrayUsageHelper(); @@ -83,17 +83,17 @@ namespace comphelper <BR> as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. - @return an pointer to the newly created array helper. Must not be NULL. + @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const = 0; }; //------------------------------------------------------------------ template<class TYPE> - sal_Int32 OIdPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; + sal_Int32 OIdPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; template<class TYPE> - OIdPropertyArrayMap* OIdPropertyArrayUsageHelper< TYPE >::s_pMap = NULL; + OIdPropertyArrayMap* OIdPropertyArrayUsageHelper< TYPE >::s_pMap = NULL; //------------------------------------------------------------------ template <class TYPE> diff --git a/comphelper/inc/comphelper/InlineContainer.hxx b/comphelper/inc/comphelper/InlineContainer.hxx index 13ae8a5cabd0..6aca1e5fd7f2 100644 --- a/comphelper/inc/comphelper/InlineContainer.hxx +++ b/comphelper/inc/comphelper/InlineContainer.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/comphelper/inc/comphelper/MasterPropertySet.hxx b/comphelper/inc/comphelper/MasterPropertySet.hxx index c5e335d6cf67..16627b97046d 100644 --- a/comphelper/inc/comphelper/MasterPropertySet.hxx +++ b/comphelper/inc/comphelper/MasterPropertySet.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 @@ -78,74 +78,74 @@ namespace comphelper virtual void _preSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) + virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; virtual void _postSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; virtual void _preGetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) + virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) = 0; virtual void _postGetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; virtual void _preGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) + virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException ); virtual void _postGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) + virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) + virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, ::osl::SolarMutex* pMutex = NULL ) throw(); - virtual ~MasterPropertySet() + virtual ~MasterPropertySet() throw(); void registerSlave ( ChainablePropertySet *pNewSet ) throw(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 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); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx index c121289622b0..fee2111c8dc5 100644 --- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx +++ b/comphelper/inc/comphelper/MasterPropertySetInfo.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,25 +45,25 @@ namespace comphelper PropertyDataHash maMap; com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; public: - MasterPropertySetInfo() + MasterPropertySetInfo() throw(); - MasterPropertySetInfo( PropertyInfo * pMap ) + MasterPropertySetInfo( PropertyInfo * pMap ) throw(); - virtual ~MasterPropertySetInfo() + virtual ~MasterPropertySetInfo() throw(); void add( PropertyInfo* pMap, sal_Int32 nCount = -1, sal_uInt8 nMapId = 0 ) throw(); void add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) throw(); - void remove( const rtl::OUString& aName ) + void remove( const rtl::OUString& aName ) throw(); // XPropertySetInfo - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) + virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; } diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/comphelper/inc/comphelper/PropertyInfoHash.hxx index d5b8ced95c5a..3a675c194f48 100644 --- a/comphelper/inc/comphelper/PropertyInfoHash.hxx +++ b/comphelper/inc/comphelper/PropertyInfoHash.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,8 +32,8 @@ #include <rtl/ustring.hxx> #include <comphelper/TypeGeneration.hxx> #include <hash_map> -namespace comphelper -{ +namespace comphelper +{ struct PropertyInfo { const sal_Char* mpName; @@ -61,13 +61,13 @@ namespace comphelper }; } -typedef std::hash_map < ::rtl::OUString, - ::comphelper::PropertyInfo*, - ::rtl::OUStringHash, +typedef std::hash_map < ::rtl::OUString, + ::comphelper::PropertyInfo*, + ::rtl::OUStringHash, ::comphelper::eqFunc > PropertyInfoHash; -typedef std::hash_map < ::rtl::OUString, - ::comphelper::PropertyData*, - ::rtl::OUStringHash, +typedef std::hash_map < ::rtl::OUString, + ::comphelper::PropertyData*, + ::rtl::OUStringHash, ::comphelper::eqFunc > PropertyDataHash; #endif diff --git a/comphelper/inc/comphelper/SelectionMultiplex.hxx b/comphelper/inc/comphelper/SelectionMultiplex.hxx index d2ce6ba79d2c..7a6cb57488e4 100644 --- a/comphelper/inc/comphelper/SelectionMultiplex.hxx +++ b/comphelper/inc/comphelper/SelectionMultiplex.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 @@ -54,7 +54,7 @@ namespace comphelper friend class OSelectionChangeMultiplexer; OSelectionChangeMultiplexer* m_pAdapter; - ::osl::Mutex& m_rMutex; + ::osl::Mutex& m_rMutex; public: OSelectionChangeListener(::osl::Mutex& _rMutex) @@ -78,14 +78,14 @@ namespace comphelper //= OSelectionChangeMultiplexer //================================================================== /// multiplexer for selection changes - class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer :public cppu::WeakImplHelper1< ::com::sun::star::view::XSelectionChangeListener> + class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer :public cppu::WeakImplHelper1< ::com::sun::star::view::XSelectionChangeListener> { friend class OSelectionChangeListener; - ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier> m_xSet; - OSelectionChangeListener* m_pListener; - sal_Int32 m_nLockCount; - sal_Bool m_bListening : 1; - sal_Bool m_bAutoSetRelease : 1; + ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier> m_xSet; + OSelectionChangeListener* m_pListener; + sal_Int32 m_nLockCount; + sal_Bool m_bListening : 1; + sal_Bool m_bAutoSetRelease : 1; OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&); OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&); @@ -101,17 +101,17 @@ namespace comphelper virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); /// incremental lock - void lock(); + void lock(); /// incremental unlock - void unlock(); + void unlock(); /// get the lock count - sal_Int32 locked() const { return m_nLockCount; } + sal_Int32 locked() const { return m_nLockCount; } void dispose(); }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // INCLUDED_COMPHELPER_SELECTION_MULTIPLEX_HXX diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/comphelper/inc/comphelper/SettingsHelper.hxx index ed951083df71..86c258f5b3b6 100644 --- a/comphelper/inc/comphelper/SettingsHelper.hxx +++ b/comphelper/inc/comphelper/SettingsHelper.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/comphelper/inc/comphelper/TypeGeneration.hxx b/comphelper/inc/comphelper/TypeGeneration.hxx index 13675c7d626f..bae86a00bb36 100644 --- a/comphelper/inc/comphelper/TypeGeneration.hxx +++ b/comphelper/inc/comphelper/TypeGeneration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <sal/types.h> #include "comphelper/comphelperdllapi.h" -#define CPPU_E2T(type) ((com::sun::star::uno::Type*)type) +#define CPPU_E2T(type) ((com::sun::star::uno::Type*)type) namespace com { namespace sun { namespace star { namespace uno { class Type; @@ -41,66 +41,66 @@ namespace comphelper { enum CppuTypes { - CPPUTYPE_UNKNOWN, // 0 == unknown == error!!!! + CPPUTYPE_UNKNOWN, // 0 == unknown == error!!!! - CPPUTYPE_BOOLEAN, //getBooleanCppuType() - CPPUTYPE_INT8, //getCppuType( (sal_Int8*)0 ) - CPPUTYPE_INT16, //getCppuType( (sal_Int16*)0 ) - CPPUTYPE_INT32, //getCppuType( (sal_Int32*)0 ) - CPPUTYPE_DOUBLE, //getCppuType( (double*)0 ) - CPPUTYPE_FLOAT, //getCppuType( (float*)0 ) - CPPUTYPE_OUSTRING, //getCppuType( (OUString*)0 ) + CPPUTYPE_BOOLEAN, //getBooleanCppuType() + CPPUTYPE_INT8, //getCppuType( (sal_Int8*)0 ) + CPPUTYPE_INT16, //getCppuType( (sal_Int16*)0 ) + CPPUTYPE_INT32, //getCppuType( (sal_Int32*)0 ) + CPPUTYPE_DOUBLE, //getCppuType( (double*)0 ) + CPPUTYPE_FLOAT, //getCppuType( (float*)0 ) + CPPUTYPE_OUSTRING, //getCppuType( (OUString*)0 ) - CPPUTYPE_FONTSLANT, //getCppuType( (FontSlant*)0 ) - CPPUTYPE_LOCALE, //getCppuType( (Locale*)0 ) - CPPUTYPE_PROPERTYVALUE, //getCppuType( (Sequence<PropertyValue>*)0 ) - CPPUTYPE_PROPERTYVALUES, //getCppuType( (Sequence<PropertyValues>*)0 ) - CPPUTYPE_BORDERLINE, //getCppuType( (table::BorderLine*)0 ) - CPPUTYPE_BREAK, //getCppuType( (style::BreakType*)0 ) - CPPUTYPE_GRAPHICLOC, //getCppuType( (style::GraphicLocation*)0 ) - CPPUTYPE_DROPCAPFMT, //getCppuType( (style::DropCapFormat*)0 ) - CPPUTYPE_LINESPACE, //getCppuType( (style::LineSpacing*)0 ) - CPPUTYPE_AWTSIZE, //getCppuType( (awt::Size*)0 ) - CPPUTYPE_SHADOWFMT, //getCppuType( (table::ShadowFormat*)0 ) - CPPUTYPE_TBLCOLSEP, //getCppuType( (Sequence<text::TableColumnSeparator>*)0 ) - CPPUTYPE_PNTSEQSEQ, //getCppuType( (PointSequenceSequence*)0 ) - CPPUTYPE_DOCIDXMRK, //getCppuType( (Sequence< Reference< XDocumentIndexMark > >*)0 ) - CPPUTYPE_SEQINT8, //getCppuType( (Sequence<sal_Int8>*)0 ) - CPPUTYPE_SEQTABSTOP, //getCppuType( (Sequence<style::TabStop>*)0 ) - CPPUTYPE_SEQANCHORTYPE, //getCppuType( (Sequence<text::TextContentAnchorType>*)0 ) - CPPUTYPE_SEQDEPTXTFLD, //getCppuType( (Sequence<Reference<XDependentTextField> >*)0 ) - CPPUTYPE_TXTCNTANCHOR, //getCppuType( (text::TextContentAnchorType*)0 ) - CPPUTYPE_WRAPTXTMODE, //getCppuType( (text::WrapTextMode*)0 ) - CPPUTYPE_COLORMODE, //getCppuType( (drawing::ColorMode*)0 ) - CPPUTYPE_PAGESTYLELAY, //getCppuType( (style::PageStyleLayout*)0 ) - CPPUTYPE_VERTALIGN, //getCppuType( (style::VerticalAlignment*)0 ) - CPPUTYPE_TABLEBORDER, //getCppuType( (table::TableBorder*)0 ) - CPPUTYPE_GRFCROP, //getCppuType( (text::GraphicCrop*)0 ) - CPPUTYPE_SECTFILELNK, //getCppuType( (text::SectionFileLink*)0 ) - CPPUTYPE_PAGENUMTYPE, //getCppuType( (const PageNumberType*)0 ) - CPPUTYPE_DATETIME, //getCppuType( (util::DateTime*)0 ) - CPPUTYPE_DATE, //getCppuType( (util::Date*)0 ) + CPPUTYPE_FONTSLANT, //getCppuType( (FontSlant*)0 ) + CPPUTYPE_LOCALE, //getCppuType( (Locale*)0 ) + CPPUTYPE_PROPERTYVALUE, //getCppuType( (Sequence<PropertyValue>*)0 ) + CPPUTYPE_PROPERTYVALUES, //getCppuType( (Sequence<PropertyValues>*)0 ) + CPPUTYPE_BORDERLINE, //getCppuType( (table::BorderLine*)0 ) + CPPUTYPE_BREAK, //getCppuType( (style::BreakType*)0 ) + CPPUTYPE_GRAPHICLOC, //getCppuType( (style::GraphicLocation*)0 ) + CPPUTYPE_DROPCAPFMT, //getCppuType( (style::DropCapFormat*)0 ) + CPPUTYPE_LINESPACE, //getCppuType( (style::LineSpacing*)0 ) + CPPUTYPE_AWTSIZE, //getCppuType( (awt::Size*)0 ) + CPPUTYPE_SHADOWFMT, //getCppuType( (table::ShadowFormat*)0 ) + CPPUTYPE_TBLCOLSEP, //getCppuType( (Sequence<text::TableColumnSeparator>*)0 ) + CPPUTYPE_PNTSEQSEQ, //getCppuType( (PointSequenceSequence*)0 ) + CPPUTYPE_DOCIDXMRK, //getCppuType( (Sequence< Reference< XDocumentIndexMark > >*)0 ) + CPPUTYPE_SEQINT8, //getCppuType( (Sequence<sal_Int8>*)0 ) + CPPUTYPE_SEQTABSTOP, //getCppuType( (Sequence<style::TabStop>*)0 ) + CPPUTYPE_SEQANCHORTYPE, //getCppuType( (Sequence<text::TextContentAnchorType>*)0 ) + CPPUTYPE_SEQDEPTXTFLD, //getCppuType( (Sequence<Reference<XDependentTextField> >*)0 ) + CPPUTYPE_TXTCNTANCHOR, //getCppuType( (text::TextContentAnchorType*)0 ) + CPPUTYPE_WRAPTXTMODE, //getCppuType( (text::WrapTextMode*)0 ) + CPPUTYPE_COLORMODE, //getCppuType( (drawing::ColorMode*)0 ) + CPPUTYPE_PAGESTYLELAY, //getCppuType( (style::PageStyleLayout*)0 ) + CPPUTYPE_VERTALIGN, //getCppuType( (style::VerticalAlignment*)0 ) + CPPUTYPE_TABLEBORDER, //getCppuType( (table::TableBorder*)0 ) + CPPUTYPE_GRFCROP, //getCppuType( (text::GraphicCrop*)0 ) + CPPUTYPE_SECTFILELNK, //getCppuType( (text::SectionFileLink*)0 ) + CPPUTYPE_PAGENUMTYPE, //getCppuType( (const PageNumberType*)0 ) + CPPUTYPE_DATETIME, //getCppuType( (util::DateTime*)0 ) + CPPUTYPE_DATE, //getCppuType( (util::Date*)0 ) - CPPUTYPE_REFINTERFACE, //getCppuType( (Reference<XInterface>*)0 ) - CPPUTYPE_REFIDXREPL, //getCppuType( (Reference<container::XIndexReplace>*)0 ) - CPPUTYPE_REFNAMECNT, //getCppuType( (Reference<container::XNameContainer>*)0 ) - CPPUTYPE_REFTEXTFRAME, //getCppuType( (Reference<text::XTextFrame>*)0 ) - CPPUTYPE_REFTEXTSECTION, //getCppuType( (Reference<text::XTextSection>*)0 ) - CPPUTYPE_REFFOOTNOTE, //getCppuType( (Reference<text::XFootnote>*)0 ) - CPPUTYPE_REFTEXT, //getCppuType( (Reference<text::XText>*)0 ) - CPPUTYPE_REFTEXTCOL, //getCppuType( (Reference<text::XTextColumns>*)0 ) + CPPUTYPE_REFINTERFACE, //getCppuType( (Reference<XInterface>*)0 ) + CPPUTYPE_REFIDXREPL, //getCppuType( (Reference<container::XIndexReplace>*)0 ) + CPPUTYPE_REFNAMECNT, //getCppuType( (Reference<container::XNameContainer>*)0 ) + CPPUTYPE_REFTEXTFRAME, //getCppuType( (Reference<text::XTextFrame>*)0 ) + CPPUTYPE_REFTEXTSECTION, //getCppuType( (Reference<text::XTextSection>*)0 ) + CPPUTYPE_REFFOOTNOTE, //getCppuType( (Reference<text::XFootnote>*)0 ) + CPPUTYPE_REFTEXT, //getCppuType( (Reference<text::XText>*)0 ) + CPPUTYPE_REFTEXTCOL, //getCppuType( (Reference<text::XTextColumns>*)0 ) - CPPUTYPE_REFFORBCHARS, //getCppuType( (Reference<XForbiddenCharacters>*)0) - CPPUTYPE_REFIDXCNTNR, //getCppuType( (Reference<XIndexContainer>*)0) - CPPUTYPE_REFTEXTCNTNT, //getCppuType( (Reference<XTextContent>*)0) - CPPUTYPE_REFBITMAP, //getCppuType( (Reference<awt::XBitmap>*)0) - CPPUTYPE_REFNMREPLACE, //getCppuType( (Reference<container::XNameReplace>*)0) - CPPUTYPE_REFCELL, //getCppuType( (Reference<table::XCell>*)0) - CPPUTYPE_REFDOCINDEX, //getCppuType( (Reference<text::XDocumentIndex>*)0) - CPPUTYPE_REFDOCIDXMRK, //getCppuType( (Reference<text::XDocumentIndexMark>*)0) - CPPUTYPE_REFTXTFIELD, //getCppuType( (Reference<text::XTextField>*)0) - CPPUTYPE_REFTXTRANGE, //getCppuType( (Reference<text::XTextRange>*)0) - CPPUTYPE_REFTXTTABLE, //getCppuType( (Reference<text::XTextTable>*)0) + CPPUTYPE_REFFORBCHARS, //getCppuType( (Reference<XForbiddenCharacters>*)0) + CPPUTYPE_REFIDXCNTNR, //getCppuType( (Reference<XIndexContainer>*)0) + CPPUTYPE_REFTEXTCNTNT, //getCppuType( (Reference<XTextContent>*)0) + CPPUTYPE_REFBITMAP, //getCppuType( (Reference<awt::XBitmap>*)0) + CPPUTYPE_REFNMREPLACE, //getCppuType( (Reference<container::XNameReplace>*)0) + CPPUTYPE_REFCELL, //getCppuType( (Reference<table::XCell>*)0) + CPPUTYPE_REFDOCINDEX, //getCppuType( (Reference<text::XDocumentIndex>*)0) + CPPUTYPE_REFDOCIDXMRK, //getCppuType( (Reference<text::XDocumentIndexMark>*)0) + CPPUTYPE_REFTXTFIELD, //getCppuType( (Reference<text::XTextField>*)0) + CPPUTYPE_REFTXTRANGE, //getCppuType( (Reference<text::XTextRange>*)0) + CPPUTYPE_REFTXTTABLE, //getCppuType( (Reference<text::XTextTable>*)0) CPPUTYPE_AWTPOINT, //getCppuType( (awt::Point*)0 ) CPPUTYPE_REFLIBCONTAINER, //getCppuType( (Reference< script::XLibraryContainer >*)0) CPPUTYPE_SEQANY, //getCppuType( (Sequence< uno::Any >*)0) diff --git a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx b/comphelper/inc/comphelper/accessiblecomponenthelper.hxx index 582d77a99283..fd4d3538d8a6 100644 --- a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx +++ b/comphelper/inc/comphelper/accessiblecomponenthelper.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 @@ -108,8 +108,8 @@ namespace comphelper //= OAccessibleExtendedComponentHelper //===================================================================== - typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleExtendedComponent - > OAccessibleExtendedComponentHelper_Base; + typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleExtendedComponent + > OAccessibleExtendedComponentHelper_Base; /** a helper class for implementing an AccessibleContext which at the same time supports an XAccessibleExtendedComponent interface. @@ -137,7 +137,7 @@ namespace comphelper }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx index 310be9321a40..fbf03c9f4421 100644 --- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx +++ b/comphelper/inc/comphelper/accessiblecontexthelper.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 comphelper class OMutexGuard { - IMutex* m_pMutex; + IMutex* m_pMutex; public: inline OMutexGuard( IMutex* _pMutex ) :m_pMutex( _pMutex ) @@ -86,9 +86,9 @@ namespace comphelper //===================================================================== class OContextHelper_Impl; - typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::accessibility::XAccessibleContext, + typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleEventBroadcaster - > OAccessibleContextHelper_Base; + > OAccessibleContextHelper_Base; /** helper class for implementing an AccessibleContext */ @@ -97,7 +97,7 @@ namespace comphelper ,public OAccessibleContextHelper_Base { private: - OContextHelper_Impl* m_pImpl; + OContextHelper_Impl* m_pImpl; protected: OAccessibleContextHelper( ); @@ -144,7 +144,7 @@ namespace comphelper XAccessible, we can compare it with all the children, instead of asking all children for their context and comparing this context with ourself.</p> */ - void lateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccessible ); + void lateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccessible ); /** retrieves the creator previously set with <method>lateInit</method> */ @@ -158,7 +158,7 @@ namespace comphelper <p>To be used in derived classes which do not supply the external lock themself, but instead get them passed from own derivees (or clients).</p> */ - void forgetExternalLock(); + void forgetExternalLock(); public: // XAccessibleEventBroadcaster @@ -201,9 +201,9 @@ namespace comphelper }; // ensures that the object is alive - inline void ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ); - inline IMutex* getExternalLock( const OAccessControl& ); - inline ::osl::Mutex& GetMutex( const OAccessControl& ); + inline void ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ); + inline IMutex* getExternalLock( const OAccessControl& ); + inline ::osl::Mutex& GetMutex( const OAccessControl& ); protected: // OComponentHelper @@ -213,15 +213,15 @@ namespace comphelper // helper /** notifies all AccessibleEventListeners of a certain event - @precond not too be called with our mutex locked - @param _nEventId + @precond not too be called with our mutex locked + @param _nEventId the id of the even. See AccessibleEventType - @param _rOldValue + @param _rOldValue the old value to be notified - @param _rNewValue + @param _rNewValue the new value to be notified */ - virtual void SAL_CALL NotifyAccessibleEvent( + virtual void SAL_CALL NotifyAccessibleEvent( const sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue @@ -232,16 +232,16 @@ namespace comphelper Can even be called with our mutex locked. - @param _nEventId + @param _nEventId the id of the even. See AccessibleEventType - @param _rOldValue + @param _rOldValue the old value to be notified - @param _rNewValue + @param _rNewValue the new value to be notified @param _rBuffer the buffer that records the event */ - virtual void SAL_CALL BufferAccessibleEvent( + virtual void SAL_CALL BufferAccessibleEvent( const sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue, @@ -250,15 +250,15 @@ namespace comphelper // life time control /// checks whether the object is alive (returns <TRUE/> then) or disposed - sal_Bool isAlive() const; + sal_Bool isAlive() const; /// checks for beeing alive. If the object is already disposed (i.e. not alive), an exception is thrown. - void ensureAlive() const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ); + void ensureAlive() const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ); /** ensures that the object is disposed. @precond to be called from within the destructor of your derived class only! */ - void ensureDisposed( ); + void ensureDisposed( ); /** shortcut for retrieving the context of the parent (returned by getAccessibleParent) */ @@ -266,26 +266,26 @@ namespace comphelper implGetParentContext() SAL_THROW( ( ::com::sun::star::uno::RuntimeException ) ); // access to the base class' broadcast helper/mutex - ::cppu::OBroadcastHelper& GetBroadcastHelper() { return rBHelper; } - const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return rBHelper; } - ::osl::Mutex& GetMutex() { return m_aMutex; } - IMutex* getExternalLock( ); + ::cppu::OBroadcastHelper& GetBroadcastHelper() { return rBHelper; } + const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return rBHelper; } + ::osl::Mutex& GetMutex() { return m_aMutex; } + IMutex* getExternalLock( ); }; //--------------------------------------------------------------------- - inline void OAccessibleContextHelper::ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ) + inline void OAccessibleContextHelper::ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ) { ensureAlive(); } //--------------------------------------------------------------------- - inline IMutex* OAccessibleContextHelper::getExternalLock( const OAccessControl& ) + inline IMutex* OAccessibleContextHelper::getExternalLock( const OAccessControl& ) { return getExternalLock(); } //--------------------------------------------------------------------- - inline ::osl::Mutex& OAccessibleContextHelper::GetMutex( const OAccessControl& ) + inline ::osl::Mutex& OAccessibleContextHelper::GetMutex( const OAccessControl& ) { return GetMutex(); } @@ -293,7 +293,7 @@ namespace comphelper //===================================================================== //= OContextEntryGuard //===================================================================== - typedef ::osl::ClearableMutexGuard OContextEntryGuard_Base; + typedef ::osl::ClearableMutexGuard OContextEntryGuard_Base; /** helper class for guarding the entry into OAccessibleContextHelper methods. <p>The class has two responsibilities: @@ -369,7 +369,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX diff --git a/comphelper/inc/comphelper/accessibleeventbuffer.hxx b/comphelper/inc/comphelper/accessibleeventbuffer.hxx index 3819651569d7..fef66ef493ea 100644 --- a/comphelper/inc/comphelper/accessibleeventbuffer.hxx +++ b/comphelper/inc/comphelper/accessibleeventbuffer.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/comphelper/inc/comphelper/accessibleeventnotifier.hxx b/comphelper/inc/comphelper/accessibleeventnotifier.hxx index c80b8ffccf14..4d67d908be82 100644 --- a/comphelper/inc/comphelper/accessibleeventnotifier.hxx +++ b/comphelper/inc/comphelper/accessibleeventnotifier.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 @@ -51,21 +51,21 @@ namespace comphelper { // typedefs public: - typedef sal_uInt32 TClientId; + typedef sal_uInt32 TClientId; typedef ::std::pair< TClientId, ::com::sun::star::accessibility::AccessibleEventObject > ClientEvent; - typedef ::cppu::OInterfaceContainerHelper EventListeners; - typedef ::std::map< TClientId, EventListeners*, ::std::less< TClientId > > ClientMap; + typedef ::cppu::OInterfaceContainerHelper EventListeners; + typedef ::std::map< TClientId, EventListeners*, ::std::less< TClientId > > ClientMap; protected: - AccessibleEventNotifier( ); // never implemented - ~AccessibleEventNotifier( ); // never implemented + AccessibleEventNotifier( ); // never implemented + ~AccessibleEventNotifier( ); // never implemented private: - COMPHELPER_DLLPRIVATE AccessibleEventNotifier( const AccessibleEventNotifier& ); // never implemented! - COMPHELPER_DLLPRIVATE AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ); // never implemented! + COMPHELPER_DLLPRIVATE AccessibleEventNotifier( const AccessibleEventNotifier& ); // never implemented! + COMPHELPER_DLLPRIVATE AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ); // never implemented! public: /** registers a client of this class, means a broadcaster of AccessibleEvents @@ -74,7 +74,7 @@ namespace comphelper dies, it <b>must</b> call <member>revokeClient</member> or <member>revokeClientNotifyDisposing</member> explicitly itself.</p> */ - static TClientId registerClient( ); + static TClientId registerClient( ); /** revokes a broadcaster of AccessibleEvents @@ -84,10 +84,10 @@ namespace comphelper When the client is disposed, you should prefer <member>revokeClientNotifyDisposing</member></p> <p>Any possibly pending events for this client are removed from the queue.</p> - + @seealso revokeClientNotifyDisposing */ - static void revokeClient( const TClientId _nClient ); + static void revokeClient( const TClientId _nClient ); /** revokes a client, with additionally notifying a disposing event to all listeners registered for this client @@ -100,7 +100,7 @@ namespace comphelper the source to be notified together with the <member scope="com.sun.star.lang">XComponent::disposing</member> call. */ - static void revokeClientNotifyDisposing( + static void revokeClientNotifyDisposing( const TClientId _nClient, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxEventSource ) SAL_THROW( ( ) ); @@ -139,14 +139,14 @@ namespace comphelper @param _nClient the id of the client which needs to broadcast the event */ - static void addEvent( + static void addEvent( const TClientId _nClient, const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) SAL_THROW( ( ) ); private: /// generates a new client id - COMPHELPER_DLLPRIVATE static TClientId generateId(); + COMPHELPER_DLLPRIVATE static TClientId generateId(); /** looks up a client in our client map, asserts if it cannot find it or no event thread is present @@ -162,11 +162,11 @@ namespace comphelper <TRUE/> if and only if the client could be found and <arg>_rPos</arg> has been filled with it's position */ - COMPHELPER_DLLPRIVATE static sal_Bool implLookupClient( const TClientId _nClient, ClientMap::iterator& _rPos ); + COMPHELPER_DLLPRIVATE static sal_Bool implLookupClient( const TClientId _nClient, ClientMap::iterator& _rPos ); }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER diff --git a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx index 6ac3373893bc..5814f6bab66f 100644 --- a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx +++ b/comphelper/inc/comphelper/accessiblekeybindinghelper.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 @@ -48,8 +48,8 @@ namespace comphelper // OAccessibleKeyBindingHelper //============================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessibleKeyBinding - > OAccessibleKeyBindingHelper_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessibleKeyBinding + > OAccessibleKeyBindingHelper_Base; /** a helper class for implementing an accessible keybinding */ @@ -57,11 +57,11 @@ namespace comphelper { private: typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyStroke > > KeyBindings; - - KeyBindings m_aKeyBindings; + + KeyBindings m_aKeyBindings; protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; virtual ~OAccessibleKeyBindingHelper(); @@ -78,7 +78,7 @@ namespace comphelper }; //.............................................................................. -} // namespace comphelper +} // namespace comphelper //.............................................................................. #endif // COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/comphelper/inc/comphelper/accessibleselectionhelper.hxx index d91693b81185..960e8d10dc9a 100644 --- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx +++ b/comphelper/inc/comphelper/accessibleselectionhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,22 +59,22 @@ namespace comphelper protected: // access to context - still waiting to be overwritten - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - implGetAccessibleContext() + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ) = 0; // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) - virtual sal_Bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) + virtual sal_Bool + implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (::com::sun::star::uno::RuntimeException) = 0; // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void - implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) + implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) = 0; protected: - + /** non-virtual versions of the methods which can be implemented using <method>implIsSelected</method> and <method>implSelect</method> */ void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -90,7 +90,7 @@ namespace comphelper //= OAccessibleSelectionHelper //===================================================================== - typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelection > OAccessibleSelectionHelper_Base; + typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelection > OAccessibleSelectionHelper_Base; /** a helper class for implementing an AccessibleSelection which at the same time supports an XAccessibleSelection interface. @@ -100,7 +100,7 @@ namespace comphelper public OAccessibleSelectionHelper_Base { protected: - + OAccessibleSelectionHelper( ); /// see the respective base class ctor for an extensive comment on this, please @@ -110,7 +110,7 @@ namespace comphelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); public: - + // XInterface DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) @@ -126,7 +126,7 @@ namespace comphelper }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/comphelper/inc/comphelper/accessibletexthelper.hxx index 4456c99b9bd1..75fc717007f2 100644 --- a/comphelper/inc/comphelper/accessibletexthelper.hxx +++ b/comphelper/inc/comphelper/accessibletexthelper.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 @@ -52,26 +52,26 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OCommonAccessibleText { private: - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > m_xBreakIter; - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > m_xCharClass; + ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > m_xBreakIter; + ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > m_xCharClass; protected: OCommonAccessibleText(); virtual ~OCommonAccessibleText(); - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > implGetBreakIterator(); - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > implGetCharacterClassification(); - sal_Bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); - virtual sal_Bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); - virtual sal_Bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); - virtual ::rtl::OUString implGetText() = 0; - virtual ::com::sun::star::lang::Locale implGetLocale() = 0; - virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; - virtual void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual sal_Bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > implGetBreakIterator(); + ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > implGetCharacterClassification(); + sal_Bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); + virtual sal_Bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); + virtual sal_Bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); + virtual ::rtl::OUString implGetText() = 0; + virtual ::com::sun::star::lang::Locale implGetLocale() = 0; + virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; + virtual void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual sal_Bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); /** non-virtual versions of the methods */ @@ -85,22 +85,22 @@ namespace comphelper ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + public: - + /** Helper method, that detects the difference between two strings and returns the deleted selection and the inserted selection if available. - + @returns true if there are differences between the two strings and false if both are equal - + @see ::com::sun::star::accessibility::AccessibleEventId ::com::sun::star::accessibility::TextSegment */ static bool implInitTextChangedEvent( - const rtl::OUString& rOldString, - const rtl::OUString& rNewString, + const rtl::OUString& rOldString, + const rtl::OUString& rNewString, /*out*/ ::com::sun::star::uno::Any& rDeleted, /*out*/ ::com::sun::star::uno::Any& rInserted); // throw() }; @@ -110,8 +110,8 @@ namespace comphelper // OAccessibleTextHelper //============================================================================== - typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleText - > OAccessibleTextHelper_Base; + typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleText + > OAccessibleTextHelper_Base; /** a helper class for implementing an AccessibleExtendedComponent which at the same time supports an XAccessibleText interface @@ -124,7 +124,7 @@ namespace comphelper OAccessibleTextHelper(); // see the respective base class ctor for an extensive comment on this, please OAccessibleTextHelper( IMutex* _pExternalLock ); - + public: // XInterface DECLARE_XINTERFACE( ) @@ -146,7 +146,7 @@ namespace comphelper }; //.............................................................................. -} // namespace comphelper +} // namespace comphelper //.............................................................................. #endif // COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX @@ -154,35 +154,35 @@ namespace comphelper // ----------------------------------------------------------------------------- // -// OAccessibleTextHelper is a helper class for implementing the +// OAccessibleTextHelper is a helper class for implementing the // XAccessibleText interface. // -// The following methods have a default implementation: -// -// getCharacter -// getCharacterCount -// getSelectedText -// getSelectionStart -// getSelectionEnd -// getText -// getTextRange -// getTextAtIndex -// getTextBeforeIndex -// getTextBehindIndex +// The following methods have a default implementation: // -// The following methods must be overriden by derived classes: +// getCharacter +// getCharacterCount +// getSelectedText +// getSelectionStart +// getSelectionEnd +// getText +// getTextRange +// getTextAtIndex +// getTextBeforeIndex +// getTextBehindIndex // -// implGetText -// implGetLocale -// implGetSelection -// getCaretPosition -// setCaretPosition -// getCharacterAttributes -// getCharacterBounds -// getIndexAtPoint -// setSelection -// copyText +// The following methods must be overriden by derived classes: // +// implGetText +// implGetLocale +// implGetSelection +// getCaretPosition +// setCaretPosition +// getCharacterAttributes +// getCharacterBounds +// getIndexAtPoint +// setSelection +// copyText +// // ----------------------------------------------------------------------------- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx index 14361cd4cb23..6f03b6ba8919 100644 --- a/comphelper/inc/comphelper/accessiblewrapper.hxx +++ b/comphelper/inc/comphelper/accessiblewrapper.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 @@ -68,7 +68,7 @@ namespace comphelper */ class COMPHELPER_DLLPUBLIC OAccessibleWrapper:public OAccessibleWrapper_Base ,public OComponentProxyAggregation - + { private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -119,17 +119,17 @@ namespace comphelper ~OAccessibleWrapper( ); private: - COMPHELPER_DLLPRIVATE OAccessibleWrapper( ); // never implemented - COMPHELPER_DLLPRIVATE OAccessibleWrapper( const OAccessibleWrapper& ); // never implemented - COMPHELPER_DLLPRIVATE OAccessibleWrapper& operator=( const OAccessibleWrapper& ); // never implemented + COMPHELPER_DLLPRIVATE OAccessibleWrapper( ); // never implemented + COMPHELPER_DLLPRIVATE OAccessibleWrapper( const OAccessibleWrapper& ); // never implemented + COMPHELPER_DLLPRIVATE OAccessibleWrapper& operator=( const OAccessibleWrapper& ); // never implemented }; //========================================================================= //= OAccessibleContextWrapperHelper //========================================================================= - typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleEventListener - > OAccessibleContextWrapperHelper_Base; + typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleEventListener + > OAccessibleContextWrapperHelper_Base; /** Helper for wrapping an XAccessibleContext by aggregating a proxy for it. @@ -161,7 +161,7 @@ namespace comphelper ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xParentAccessible; - OWrappedAccessibleChildrenManager* m_pChildMapper; // for mapping children from our inner context to our callers + OWrappedAccessibleChildrenManager* m_pChildMapper; // for mapping children from our inner context to our callers protected: /** ctor @@ -230,17 +230,17 @@ namespace comphelper protected: ~OAccessibleContextWrapperHelper( ); - OAccessibleContextWrapperHelper( ); // never implemented - OAccessibleContextWrapperHelper( const OAccessibleContextWrapperHelper& ); // never implemented - OAccessibleContextWrapperHelper& operator=( const OAccessibleContextWrapperHelper& ); // never implemented + OAccessibleContextWrapperHelper( ); // never implemented + OAccessibleContextWrapperHelper( const OAccessibleContextWrapperHelper& ); // never implemented + OAccessibleContextWrapperHelper& operator=( const OAccessibleContextWrapperHelper& ); // never implemented }; //========================================================================= //= OAccessibleContextWrapper //========================================================================= - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::accessibility::XAccessibleEventBroadcaster - , ::com::sun::star::accessibility::XAccessibleContext - > OAccessibleContextWrapper_CBase; + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::accessibility::XAccessibleEventBroadcaster + , ::com::sun::star::accessibility::XAccessibleContext + > OAccessibleContextWrapper_CBase; class COMPHELPER_DLLPUBLIC OAccessibleContextWrapper :public OBaseMutex @@ -248,7 +248,7 @@ namespace comphelper ,public OAccessibleContextWrapperHelper { private: - ::comphelper::AccessibleEventNotifier::TClientId m_nNotifierClient; // for notifying AccessibleEvents + ::comphelper::AccessibleEventNotifier::TClientId m_nNotifierClient; // for notifying AccessibleEvents public: /** ctor @@ -312,23 +312,23 @@ namespace comphelper virtual ~OAccessibleContextWrapper(); private: - COMPHELPER_DLLPRIVATE OAccessibleContextWrapper(); // never implemented - COMPHELPER_DLLPRIVATE OAccessibleContextWrapper( const OAccessibleContextWrapper& ); // never implemented - COMPHELPER_DLLPRIVATE OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ); // never implemented + COMPHELPER_DLLPRIVATE OAccessibleContextWrapper(); // never implemented + COMPHELPER_DLLPRIVATE OAccessibleContextWrapper( const OAccessibleContextWrapper& ); // never implemented + COMPHELPER_DLLPRIVATE OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ); // never implemented }; //========================================================================= //= OWrappedAccessibleChildrenManager //========================================================================= - typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - , ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - , OInterfaceCompare< ::com::sun::star::accessibility::XAccessible > - > AccessibleMap; + typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + , ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + , OInterfaceCompare< ::com::sun::star::accessibility::XAccessible > + > AccessibleMap; // TODO: think about if we should hold these objects weak - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::lang::XEventListener - > OWrappedAccessibleChildrenManager_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::lang::XEventListener + > OWrappedAccessibleChildrenManager_Base; /** manages wrapping XAccessible's to XAccessible's */ class COMPHELPER_DLLPUBLIC OWrappedAccessibleChildrenManager : public OWrappedAccessibleChildrenManager_Base @@ -337,9 +337,9 @@ namespace comphelper ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > - m_aOwningAccessible; // the XAccessible which belongs to the XAccessibleContext which we work for - AccessibleMap m_aChildrenMap; // for caching children - sal_Bool m_bTransientChildren; // are we prohibited to cache our children? + m_aOwningAccessible; // the XAccessible which belongs to the XAccessibleContext which we work for + AccessibleMap m_aChildrenMap; // for caching children + sal_Bool m_bTransientChildren; // are we prohibited to cache our children? public: /// ctor @@ -350,12 +350,12 @@ namespace comphelper /** specifies if the children are to be consideren transient (i.e.: not cached) <p>to be called only once per lifetime</p> */ - void setTransientChildren( sal_Bool _bSet = sal_True ); + void setTransientChildren( sal_Bool _bSet = sal_True ); /** sets the XAccessible which belongs to the XAccessibleContext which we work for <p>to be called only once per lifetime</p> */ - void setOwningAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAcc ); + void setOwningAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAcc ); /// retrieves a wrapper for the given accessible ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -365,27 +365,27 @@ namespace comphelper ); /// erases the given key from the map (if it is present there) - void removeFromCache( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxKey ); + void removeFromCache( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxKey ); /// invalidates (i.e. empties) the map - void invalidateAll( ); + void invalidateAll( ); /** disposes (i.e. cleares) the manager <p>Note that the XAccessibleContext's of the mapped XAccessible objects are disposed, too.</p> */ - void dispose(); + void dispose(); /** handles a notification as got from the parent of the children we're managing <p>This applies only to the notifications which have a direct impact on our map.</p> */ - void handleChildNotification( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ); + void handleChildNotification( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ); /** translates events as got from the parent of the children we're managing <p>This applies only to the notifications which deal with child objects which we manage.</p> */ - void translateAccessibleEvent( - const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent, + void translateAccessibleEvent( + const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent, ::com::sun::star::accessibility::AccessibleEventObject& _rTranslatedEvent ); @@ -394,19 +394,19 @@ namespace comphelper virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); protected: - void implTranslateChildEventValue( const ::com::sun::star::uno::Any& _rInValue, ::com::sun::star::uno::Any& _rOutValue ); + void implTranslateChildEventValue( const ::com::sun::star::uno::Any& _rInValue, ::com::sun::star::uno::Any& _rOutValue ); protected: ~OWrappedAccessibleChildrenManager( ); private: - COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( ); // never implemented - COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ); // never implemented - COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ); // never implemented + COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( ); // never implemented + COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ); // never implemented + COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ); // never implemented }; //............................................................................. -} // namespace accessibility +} // namespace accessibility //............................................................................. #endif // COMPHELPER_ACCESSIBLE_WRAPPER_HXX diff --git a/comphelper/inc/comphelper/accimplaccess.hxx b/comphelper/inc/comphelper/accimplaccess.hxx index 8ba9fe43867e..e2ed5005a19b 100644 --- a/comphelper/inc/comphelper/accimplaccess.hxx +++ b/comphelper/inc/comphelper/accimplaccess.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 @@ -47,8 +47,8 @@ namespace comphelper //===================================================================== //= OAccessibleImplementationAccess //===================================================================== - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XUnoTunnel - > OAccImpl_Base; + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XUnoTunnel + > OAccImpl_Base; struct OAccImpl_Impl; /** This is a helper class which allows accessing several aspects of the the implementation @@ -76,7 +76,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OAccessibleImplementationAccess : public OAccImpl_Base { private: - OAccImpl_Impl* m_pImpl; + OAccImpl_Impl* m_pImpl; protected: /// retrieves the parent previously set via <method>setAccessibleParent</method> @@ -87,14 +87,14 @@ namespace comphelper @return a bit mask, where a set bit 2^n means that the AccessibleStateType n has been set */ - sal_Int64 implGetForeignControlledStates( ) const; + sal_Int64 implGetForeignControlledStates( ) const; /// sets the accessible parent component - virtual void setAccessibleParent( + virtual void setAccessibleParent( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccParent ); /// sets or resets a bit of the foreign controlled states - virtual void setStateBit( const sal_Int16 _nState, const sal_Bool _bSet ); + virtual void setStateBit( const sal_Int16 _nState, const sal_Bool _bSet ); protected: OAccessibleImplementationAccess( ); @@ -114,7 +114,7 @@ namespace comphelper is an invalid context (which means it is <NULL/>, or the implementation is not derived from <type>OAccessibleImplementationAccess</type>, or retrieving the implementation failed). */ - static OAccessibleImplementationAccess* getImplementation( + static OAccessibleImplementationAccess* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent ); @@ -129,7 +129,7 @@ namespace comphelper <TRUE/> in case of success, <FALSE/> otherwise. For error condition please look at <method>getImplementation</method>. */ - static sal_Bool setAccessibleParent( + static sal_Bool setAccessibleParent( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewParent ); @@ -146,19 +146,19 @@ namespace comphelper <TRUE/> in case of success, <FALSE/> otherwise. For error condition please look at <method>getImplementation</method>. */ - static sal_Bool setForeignControlledState( + static sal_Bool setForeignControlledState( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent, const sal_Int16 _nState, - const sal_Bool _bSet + const sal_Bool _bSet ); - + private: COMPHELPER_DLLPRIVATE static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId(); }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/inc/comphelper/anytostring.hxx b/comphelper/inc/comphelper/anytostring.hxx index f1f91b2c6e00..282e42d8a420 100644 --- a/comphelper/inc/comphelper/anytostring.hxx +++ b/comphelper/inc/comphelper/anytostring.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace comphelper { /** Creates a STRING representation out of an ANY value. - + @param value ANY value @return diff --git a/comphelper/inc/comphelper/asyncnotification.hxx b/comphelper/inc/comphelper/asyncnotification.hxx index 8f660d18559b..a00bf2d40c9a 100644 --- a/comphelper/inc/comphelper/asyncnotification.hxx +++ b/comphelper/inc/comphelper/asyncnotification.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/comphelper/inc/comphelper/attributelist.hxx b/comphelper/inc/comphelper/attributelist.hxx index d34b32f00ac6..b8afa14cf770 100644 --- a/comphelper/inc/comphelper/attributelist.hxx +++ b/comphelper/inc/comphelper/attributelist.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 @@ -57,17 +57,17 @@ public: void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & ); // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength(void) + virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) + virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) + virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) + virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) + virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) + virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/comphelper/inc/comphelper/basicio.hxx b/comphelper/inc/comphelper/basicio.hxx index 7604b1a7029d..6e30b5ba5ce6 100644 --- a/comphelper/inc/comphelper/basicio.hxx +++ b/comphelper/inc/comphelper/basicio.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,9 +38,9 @@ namespace comphelper { //......................................................................... -namespace stario = ::com::sun::star::io; -namespace staruno = ::com::sun::star::uno; -namespace starawt = ::com::sun::star::awt; +namespace stario = ::com::sun::star::io; +namespace staruno = ::com::sun::star::uno; +namespace starawt = ::com::sun::star::awt; // sal_Bool COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Bool& _rVal); @@ -100,7 +100,7 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_BASIC_IO_HXX_ diff --git a/comphelper/inc/comphelper/broadcasthelper.hxx b/comphelper/inc/comphelper/broadcasthelper.hxx index aa61db5d3ff8..d1fe47f812da 100644 --- a/comphelper/inc/comphelper/broadcasthelper.hxx +++ b/comphelper/inc/comphelper/broadcasthelper.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,23 +39,23 @@ namespace comphelper //================================================================================== //= OMutexAndBroadcastHelper - a class which holds a Mutex and a OBroadcastHelper; - //= needed because when deriving from OPropertySetHelper, - //= the OBroadcastHelper has to be initialized before - //= the OPropertySetHelper + //= needed because when deriving from OPropertySetHelper, + //= the OBroadcastHelper has to be initialized before + //= the OPropertySetHelper //================================================================================== class OMutexAndBroadcastHelper { protected: - ::osl::Mutex m_aMutex; - ::cppu::OBroadcastHelper m_aBHelper; - + ::osl::Mutex m_aMutex; + ::cppu::OBroadcastHelper m_aBHelper; + public: OMutexAndBroadcastHelper() : m_aBHelper( m_aMutex ) { } - - ::osl::Mutex& GetMutex() { return m_aMutex; } - ::cppu::OBroadcastHelper& GetBroadcastHelper() { return m_aBHelper; } - const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return m_aBHelper; } - + + ::osl::Mutex& GetMutex() { return m_aMutex; } + ::cppu::OBroadcastHelper& GetBroadcastHelper() { return m_aBHelper; } + const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return m_aBHelper; } + }; // base class for all classes who are derived from OPropertySet and from OComponent diff --git a/comphelper/inc/comphelper/classids.hxx b/comphelper/inc/comphelper/classids.hxx index dcfe50248d20..4eeafadf1fa2 100644 --- a/comphelper/inc/comphelper/classids.hxx +++ b/comphelper/inc/comphelper/classids.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/comphelper/inc/comphelper/comphelperdllapi.h b/comphelper/inc/comphelper/comphelperdllapi.h index 32c86f8fd3b7..1c538de2a078 100644 --- a/comphelper/inc/comphelper/comphelperdllapi.h +++ b/comphelper/inc/comphelper/comphelperdllapi.h @@ -1,16 +1,16 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef INCLUDED_COMPHELPERDLLAPI_H #define INCLUDED_COMPHELPERDLLAPI_H - + #include "sal/types.h" - + #if defined(COMPHELPER_DLLIMPLEMENTATION) #define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define COMPHELPER_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_COMPHELPERDLLAPI_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/inc/comphelper/componentbase.hxx b/comphelper/inc/comphelper/componentbase.hxx index db3e558904b9..3783f4c69ce8 100644 --- a/comphelper/inc/comphelper/componentbase.hxx +++ b/comphelper/inc/comphelper/componentbase.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx index 410d2390619c..8a286b2c9974 100644 --- a/comphelper/inc/comphelper/componentcontext.hxx +++ b/comphelper/inc/comphelper/componentcontext.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/comphelper/inc/comphelper/componentfactory.hxx b/comphelper/inc/comphelper/componentfactory.hxx index 2da7de3f3c82..29f92b71ddc2 100644 --- a/comphelper/inc/comphelper/componentfactory.hxx +++ b/comphelper/inc/comphelper/componentfactory.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 @@ -43,10 +43,10 @@ #ifdef UNX // "libNAMExy.so" (__DLLEXTENSION == "xy.so") -#define LLCF_LIBNAME( name ) "lib" name __DLLEXTENSION +#define LLCF_LIBNAME( name ) "lib" name __DLLEXTENSION #else // "NAMExy.dll" (__DLLEXTENSION == "xy") -#define LLCF_LIBNAME( name ) name __DLLEXTENSION ".dll" +#define LLCF_LIBNAME( name ) name __DLLEXTENSION ".dll" #endif @@ -114,7 +114,7 @@ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XI ); -} // namespace comphelper +} // namespace comphelper #endif // _COMPHELPER_COMPONENTFACTORY_HXX diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx index d117cc75bb0c..2f81f6f368ac 100644 --- a/comphelper/inc/comphelper/componentmodule.hxx +++ b/comphelper/inc/comphelper/componentmodule.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/comphelper/inc/comphelper/composedprops.hxx b/comphelper/inc/comphelper/composedprops.hxx index 74a9cf30acd1..177c389010a9 100644 --- a/comphelper/inc/comphelper/composedprops.hxx +++ b/comphelper/inc/comphelper/composedprops.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 @@ namespace comphelper { public: /** determines whether or not a property should appear in the composed property set - @param _rPropertyName + @param _rPropertyName the name of the property */ virtual sal_Bool isComposeable(const ::rtl::OUString& _rPropertyName) const = 0; @@ -59,9 +59,9 @@ namespace comphelper //= OComposedPropertySet //===================================================================== class OComposedPropertySetInfo; - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertySet - , ::com::sun::star::beans::XPropertyState - > OComposedPropertySet_Base; + typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertySet + , ::com::sun::star::beans::XPropertyState + > OComposedPropertySet_Base; /** helper class for composing a property set from a sequence of other property sets. <p>First: This class is a fast shot, so don't sue me :) (To be honest, it's the migration of an old ugly implementation. It's still ugly).</p> @@ -74,12 +74,12 @@ namespace comphelper private: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > m_aProperties; - OComposedPropertySetInfo* m_pInfo; + OComposedPropertySetInfo* m_pInfo; protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>, PropertySetArray); - PropertySetArray m_aSingleSets; + PropertySetArray m_aSingleSets; public: /** constructs a composed property set @@ -116,11 +116,11 @@ namespace comphelper protected: ~OComposedPropertySet(); - void compose(const IPropertySetComposerCallback* _pMetaData); + void compose(const IPropertySetComposerCallback* _pMetaData); }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_COMPOSEDPROPS_HXX_ diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx index 3800cea7a0ba..36099fed860d 100644 --- a/comphelper/inc/comphelper/configurationhelper.hxx +++ b/comphelper/inc/comphelper/configurationhelper.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/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx index f0466fe3ae5e..e3b9d752c805 100644 --- a/comphelper/inc/comphelper/container.hxx +++ b/comphelper/inc/comphelper/container.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 @@ -46,17 +46,17 @@ namespace comphelper class COMPHELPER_DLLPUBLIC IndexAccessIterator { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStartingPoint; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStartingPoint; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xCurrentObject; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xCurrentObject; // das aktuelle Objekt - ::std::vector<sal_Int32> m_arrChildIndizies; + ::std::vector<sal_Int32> m_arrChildIndizies; // ich bewege mich eigentlich durch einen Baum, dummerweise haben dessen // Elemente aber kein GetNextSibling, also muss ich mir merken, wo die Childs // innerhalb ihres Parents sitzen (das ist sozusagen der Pfad von der Wurzel // zu m_xCurrentObject - ::rtl::OUString m_ustrProperty; + ::rtl::OUString m_ustrProperty; // der Name der gesuchten property public: @@ -64,7 +64,7 @@ public: virtual ~IndexAccessIterator(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> Next(); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> Next(); virtual void Invalidate() { m_xCurrentObject = NULL; } @@ -78,7 +78,7 @@ protected: }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_CONTAINER_HXX_ diff --git a/comphelper/inc/comphelper/containermultiplexer.hxx b/comphelper/inc/comphelper/containermultiplexer.hxx index 68990ec694f6..3bb11b3d0cfc 100644 --- a/comphelper/inc/comphelper/containermultiplexer.hxx +++ b/comphelper/inc/comphelper/containermultiplexer.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 @@ -52,8 +52,8 @@ namespace comphelper { friend class OContainerListenerAdapter; protected: - OContainerListenerAdapter* m_pAdapter; - ::osl::Mutex& m_rMutex; + OContainerListenerAdapter* m_pAdapter; + ::osl::Mutex& m_rMutex; public: OContainerListener(::osl::Mutex& _rMutex); @@ -79,8 +79,8 @@ namespace comphelper protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; - OContainerListener* m_pListener; - sal_Int32 m_nLockCount; + OContainerListener* m_pListener; + sal_Int32 m_nLockCount; virtual ~OContainerListenerAdapter(); @@ -97,19 +97,19 @@ namespace comphelper virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); // locking the multiplexer - void lock(); - void unlock(); - sal_Int32 locked() const { return m_nLockCount; } + void lock(); + void unlock(); + sal_Int32 locked() const { return m_nLockCount; } /// dispose the object. No multiplexing anymore - void dispose(); + void dispose(); const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& getContainer() const { return m_xContainer; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _COMPHELPER_CONTAINERMULTIPLEXER_HXX_ diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx index 4845b0ccd04b..7917f11b17ef 100644 --- a/comphelper/inc/comphelper/docpasswordhelper.hxx +++ b/comphelper/inc/comphelper/docpasswordhelper.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 @@ -117,7 +117,7 @@ public: <FALSE/> otherwise */ - static sal_Bool IsModifyPasswordCorrect( + static sal_Bool IsModifyPasswordCorrect( const ::rtl::OUString& aPassword, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo ); @@ -193,7 +193,7 @@ public: static ::com::sun::star::uno::Sequence< sal_Int8 > GetXLHashAsSequence( const ::rtl::OUString& aString, rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); - + // ------------------------------------------------------------------------ /** This helper function tries to request and verify a password to load a diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx index 569160cc1809..b7444105ccdd 100644 --- a/comphelper/inc/comphelper/docpasswordrequest.hxx +++ b/comphelper/inc/comphelper/docpasswordrequest.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 @@ -54,7 +54,7 @@ class PasswordContinuation; /** Implements the task.XInteractionRequest interface for requesting a password string for a document. */ -class COMPHELPER_DLLPUBLIC DocPasswordRequest : +class COMPHELPER_DLLPUBLIC DocPasswordRequest : public ::com::sun::star::task::XInteractionRequest, public ::cppu::OWeakObject { diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx index 01a315f984ac..b05b3d843df0 100644 --- a/comphelper/inc/comphelper/documentconstants.hxx +++ b/comphelper/inc/comphelper/documentconstants.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 @@ -72,7 +72,7 @@ #define MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII "application/vnd.oasis.opendocument.chart" #define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII "application/vnd.oasis.opendocument.formula" #define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII "application/vnd.oasis.opendocument.base" -#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII "application/vnd.sun.xml.report" +#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII "application/vnd.sun.xml.report" #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII "application/vnd.sun.xml.report.chart" #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) ) @@ -84,8 +84,8 @@ #define MIMETYPE_OASIS_OPENDOCUMENT_CHART ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) ) #define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) ) #define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) ) -#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) ) -#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) ) +#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) ) +#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) ) // template formats of SO8 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII "application/vnd.oasis.opendocument.text-template" diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/comphelper/inc/comphelper/documentinfo.hxx index baa06e7d7d4b..b4bad4d0ec11 100644 --- a/comphelper/inc/comphelper/documentinfo.hxx +++ b/comphelper/inc/comphelper/documentinfo.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/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx index 8069534b1e3a..7006cc6d66e3 100644 --- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx +++ b/comphelper/inc/comphelper/embeddedobjectcontainer.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 @@ -76,8 +76,8 @@ public: ~EmbeddedObjectContainer(); void SwitchPersistence( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& ); - sal_Bool CommitImageSubStorage(); - void ReleaseImageSubStorage(); + sal_Bool CommitImageSubStorage(); + void ReleaseImageSubStorage(); ::rtl::OUString CreateUniqueObjectName(); @@ -153,13 +153,13 @@ public: sal_Bool InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const ::rtl::OUString& rMediaType ); // try to add a graphical representation for an object in optimized way ( might fail ) - sal_Bool InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType ); + sal_Bool InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType ); // remove a graphical representation for an object sal_Bool RemoveGraphicStream( const ::rtl::OUString& rObjectName ); // copy the graphical representation from different container - sal_Bool TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc, + sal_Bool TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc, const ::rtl::OUString& aOrigName, const ::rtl::OUString& aTargetName ); diff --git a/comphelper/inc/comphelper/enumhelper.hxx b/comphelper/inc/comphelper/enumhelper.hxx index fbf42d0d5673..c002c4ceac9f 100644 --- a/comphelper/inc/comphelper/enumhelper.hxx +++ b/comphelper/inc/comphelper/enumhelper.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,9 +44,9 @@ namespace comphelper { //......................................................................... - namespace starcontainer = ::com::sun::star::container; - namespace staruno = ::com::sun::star::uno; - namespace starlang = ::com::sun::star::lang; + namespace starcontainer = ::com::sun::star::container; + namespace staruno = ::com::sun::star::uno; + namespace starlang = ::com::sun::star::lang; //================================================================== //= OEnumerationLock @@ -68,7 +68,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock starlang::XEventListener > { staruno::Sequence< ::rtl::OUString > m_aNames; - sal_Int32 m_nPos; + sal_Int32 m_nPos; staruno::Reference< starcontainer::XNameAccess > m_xAccess; sal_Bool m_bListening; @@ -123,7 +123,7 @@ private: //================================================================== /** provides an <type scope="com.sun.star.container">XEnumeration</type> for an outside set vector of Any's. - + */ class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock , public ::cppu::WeakImplHelper1< starcontainer::XEnumeration > diff --git a/comphelper/inc/comphelper/eventattachermgr.hxx b/comphelper/inc/comphelper/eventattachermgr.hxx index f534ba26dbe5..ae6cd7dc8681 100644 --- a/comphelper/inc/comphelper/eventattachermgr.hxx +++ b/comphelper/inc/comphelper/eventattachermgr.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/comphelper/inc/comphelper/evtlistenerhlp.hxx b/comphelper/inc/comphelper/evtlistenerhlp.hxx index 8abf94b915ce..7b6ca0d35c84 100644 --- a/comphelper/inc/comphelper/evtlistenerhlp.hxx +++ b/comphelper/inc/comphelper/evtlistenerhlp.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 @@ -52,7 +52,7 @@ namespace comphelper virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); }; //........................................................................ -} // namespace comphelper +} // namespace comphelper //........................................................................ #endif // COMPHELPER_EVENTLISTENERHELPER_HXX diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/comphelper/inc/comphelper/evtmethodhelper.hxx index c8c9ec9eb40f..b55130dcfed8 100644 --- a/comphelper/inc/comphelper/evtmethodhelper.hxx +++ b/comphelper/inc/comphelper/evtmethodhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace comphelper COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type); //........................................................................ -} // namespace comphelper +} // namespace comphelper //........................................................................ #endif // COMPHELPER_EVENTMEHODHELPER_HXX diff --git a/comphelper/inc/comphelper/extract.hxx b/comphelper/inc/comphelper/extract.hxx index 4fcaab595b96..6b960fbf5375 100644 --- a/comphelper/inc/comphelper/extract.hxx +++ b/comphelper/inc/comphelper/extract.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 @@ -41,8 +41,8 @@ namespace cppu /** * Sets enum from int32 value. This function does NOT check for valid enum values! *<BR> - * @param nEnum int32 enum value - * @param rType enum type + * @param nEnum int32 enum value + * @param rType enum type * @return enum or emoty any. */ inline ::com::sun::star::uno::Any SAL_CALL int2enum( @@ -59,8 +59,8 @@ inline ::com::sun::star::uno::Any SAL_CALL int2enum( /** * Sets int32 from enum or int in any. *<BR> - * @param rnEnum [out] int32 enum value - * @param rAny enum or int + * @param rnEnum [out] int32 enum value + * @param rAny enum or int * @param sal_True if enum or int value was set else sal_False. */ inline sal_Bool SAL_CALL enum2int( sal_Int32 & rnEnum, const ::com::sun::star::uno::Any & rAny ) @@ -77,9 +77,9 @@ inline sal_Bool SAL_CALL enum2int( sal_Int32 & rnEnum, const ::com::sun::star::u /** * Sets int32 from enum or int in any with additional typecheck * <BR> - * @param rAny enum or int - * @param eRet the enum value as int. If there is not enum of the given type or - * a ::com::sun::star::lang::IllegalArgumentException is thrown + * @param rAny enum or int + * @param eRet the enum value as int. If there is not enum of the given type or + * a ::com::sun::star::lang::IllegalArgumentException is thrown */ template< typename E > inline void SAL_CALL any2enum( E & eRet, const ::com::sun::star::uno::Any & rAny ) @@ -114,8 +114,8 @@ inline ::com::sun::star::uno::Any SAL_CALL enum2any( E eEnum ) * it will be queried for it. * If no interface is available, the out ref will be cleared. *<BR> - * @param rxOut [out] demanded interface - * @param rAny interface + * @param rxOut [out] demanded interface + * @param rAny interface * @return sal_True if any reference (including the null ref) was retrieved from any else sal_False. */ template< class T > diff --git a/comphelper/inc/comphelper/fileformat.h b/comphelper/inc/comphelper/fileformat.h index 7b047e73d349..f6645f502ecb 100644 --- a/comphelper/inc/comphelper/fileformat.h +++ b/comphelper/inc/comphelper/fileformat.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 @@ -31,11 +31,11 @@ /* file format versions *************************************************/ -#define SOFFICE_FILEFORMAT_31 3450 -#define SOFFICE_FILEFORMAT_40 3580 -#define SOFFICE_FILEFORMAT_50 5050 -#define SOFFICE_FILEFORMAT_60 6200 -#define SOFFICE_FILEFORMAT_8 6800 +#define SOFFICE_FILEFORMAT_31 3450 +#define SOFFICE_FILEFORMAT_40 3580 +#define SOFFICE_FILEFORMAT_50 5050 +#define SOFFICE_FILEFORMAT_60 6200 +#define SOFFICE_FILEFORMAT_8 6800 #define SOFFICE_FILEFORMAT_CURRENT SOFFICE_FILEFORMAT_8 #endif diff --git a/comphelper/inc/comphelper/genericpropertyset.hxx b/comphelper/inc/comphelper/genericpropertyset.hxx index a5b3608fc964..984554b817d0 100644 --- a/comphelper/inc/comphelper/genericpropertyset.hxx +++ b/comphelper/inc/comphelper/genericpropertyset.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/comphelper/inc/comphelper/guarding.hxx b/comphelper/inc/comphelper/guarding.hxx index 7593b4846cd6..41807997a136 100644 --- a/comphelper/inc/comphelper/guarding.hxx +++ b/comphelper/inc/comphelper/guarding.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 @@ -47,17 +47,17 @@ namespace comphelper template <class MUTEX> class ORelease { - MUTEX& m_rMutex; + MUTEX& m_rMutex; public: ORelease(MUTEX& _rMutex) : m_rMutex(_rMutex) { _rMutex.release(); } ~ORelease() { m_rMutex.acquire(); } }; -typedef ORelease< ::osl::Mutex > MutexRelease; +typedef ORelease< ::osl::Mutex > MutexRelease; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_GUARDING_HXX_ diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx index 773946cd9af1..499d213708fd 100644 --- a/comphelper/inc/comphelper/ihwrapnofilter.hxx +++ b/comphelper/inc/comphelper/ihwrapnofilter.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/comphelper/inc/comphelper/implbase_var.hxx b/comphelper/inc/comphelper/implbase_var.hxx index 2499ce94f625..a96c578385dc 100644 --- a/comphelper/inc/comphelper/implbase_var.hxx +++ b/comphelper/inc/comphelper/implbase_var.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 @@ -28,7 +28,7 @@ /** This header generates the following template classes with a variable number of interfaces: - + comphelper::ImplHelper<N> <typename Ifc1, ..., typename Ifc<N> > comphelper::WeakImplHelper<N> <typename Ifc1, ..., typename Ifc<N> > comphelper::WeakComponentImplHelper<N> <typename Ifc1, ..., @@ -42,11 +42,11 @@ Don't use this header for interface numbers up to 12; always use the existing cppuhelper/(impl|comp)base<1-12>.hxx headers for this purpose, which eases debugging. - + Including this header requires a little discipline, because it has no include guards. Please use the following external include guard rule where <N> is the number of interface types: - + #if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>) #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N> #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER <N> @@ -140,7 +140,7 @@ struct BOOST_PP_CAT(ImplClassData, COMPHELPER_IMPLBASE_INTERFACE_NUMBER) /** 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 @@ -188,7 +188,7 @@ public: ::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 @@ -212,7 +212,7 @@ class SAL_NO_VTABLE BOOST_PP_CAT(WeakImplHelper, BOOST_PP_CAT(WeakImplHelper, COMPHELPER_IMPLBASE_INTERFACE_NUMBER)< BOOST_PP_ENUM_PARAMS(COMPHELPER_IMPLBASE_INTERFACE_NUMBER, Ifc)> > > {}; - + public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const& rType ) @@ -237,18 +237,18 @@ public: /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and ::com::sun::star::uno::XInterface inherting from a BaseClass. - + All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), 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 and ::com::sun::star::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with COMPHELPER_IMPLBASE_MAX_CTOR_ARGS or fewer arguments. - + @derive Inherit from this class giving your additional interface(s) to be implemented as template argument(s). Your sub class defines method @@ -274,7 +274,7 @@ class SAL_NO_VTABLE BOOST_PP_CAT(ImplInheritanceHelper, BaseClass, BOOST_PP_ENUM_PARAMS(COMPHELPER_IMPLBASE_INTERFACE_NUMBER, Ifc)> > > {}; - + protected: #define COMPHELPER_IMPLBASE_templctor_args(z_, n_, unused_) \ BOOST_PP_CAT(T, n_) const& BOOST_PP_CAT(arg, n_) @@ -284,7 +284,7 @@ protected: BOOST_PP_ENUM(BOOST_PP_ADD(n_, 1), \ COMPHELPER_IMPLBASE_templctor_args, ~) ) \ : BaseClass( BOOST_PP_ENUM_PARAMS(BOOST_PP_ADD(n_, 1), arg) ) {} - + BOOST_PP_CAT(ImplInheritanceHelper, COMPHELPER_IMPLBASE_INTERFACE_NUMBER)() : BaseClass() {} BOOST_PP_REPEAT(COMPHELPER_IMPLBASE_MAX_CTOR_ARGS, @@ -324,15 +324,15 @@ public: /** 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 @@ -357,11 +357,11 @@ class SAL_NO_VTABLE BOOST_PP_CAT(WeakComponentImplHelper, COMPHELPER_IMPLBASE_INTERFACE_NUMBER)< BOOST_PP_ENUM_PARAMS(COMPHELPER_IMPLBASE_INTERFACE_NUMBER, Ifc)> > > {}; - + public: BOOST_PP_CAT(WeakComponentImplHelper, COMPHELPER_IMPLBASE_INTERFACE_NUMBER)( ::osl::Mutex & rMutex ) : WeakComponentImplHelperBase(rMutex) {} - + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const& rType ) throw (::com::sun::star::uno::RuntimeException) @@ -381,7 +381,7 @@ public: SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) { return ::cppu::ImplHelper_getImplementationId( cd::get() ); } - + // implement XComponent directly avoiding ambiguities: virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) diff --git a/comphelper/inc/comphelper/implementationreference.hxx b/comphelper/inc/comphelper/implementationreference.hxx index dff242b78307..70a15e551785 100644 --- a/comphelper/inc/comphelper/implementationreference.hxx +++ b/comphelper/inc/comphelper/implementationreference.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 @@ -93,15 +93,15 @@ namespace comphelper have UnoType be something different from XInterface, governed by the usage of the C++ interface) - @sample ImplementationReference< MyCppType, XMyInterface > + @sample ImplementationReference< MyCppType, XMyInterface > - @sample ImplementationReference< MyAbstractCppType, XMyInterface, XInterface > + @sample ImplementationReference< MyAbstractCppType, XMyInterface, XInterface > for an abstract C++ class @see ::rtl::Reference */ - template < class CppType, + template < class CppType, class UnoType, class XIfType=UnoType > class ImplementationReference { @@ -112,7 +112,7 @@ namespace comphelper typedef XIfType UnambiguousXInterfaceType; /** Default-construct an ImplementationReference - + Uno reference will be invalid, implementation pointer will be NULL. */ @@ -196,28 +196,28 @@ namespace comphelper Compatibility method to get an auto_ptr-compatible interface */ - ImplementationType* get() { return mpImpl; } - const ImplementationType* get() const { return mpImpl; } + ImplementationType* get() { return mpImpl; } + const ImplementationType* get() const { return mpImpl; } /** Release all references Compatibility method to get an auto_ptr-compatible interface */ - void reset() { dispose(); } + void reset() { dispose(); } /** Release all references - + This method releases the UNO interface reference, and clears the C++ pointer to NULL. */ - void dispose() { mxRef = NULL; mpImpl=NULL; } + void dispose() { mxRef = NULL; mpImpl=NULL; } - ImplementationType* operator->() { return mpImpl; } - const ImplementationType* operator->() const { return mpImpl; } + ImplementationType* operator->() { return mpImpl; } + const ImplementationType* operator->() const { return mpImpl; } - ImplementationType& operator*() { return *mpImpl; } - const ImplementationType& operator*() const { return *mpImpl; } + ImplementationType& operator*() { return *mpImpl; } + const ImplementationType& operator*() const { return *mpImpl; } /// Access to the underlying UNO reference, without extra querying ::com::sun::star::uno::Reference< UnoInterfaceType > getRef() { return mxRef; } @@ -231,7 +231,7 @@ namespace comphelper // ImplementationReference& operator= ( const ImplementationReference& ); /** Comparison operator - + Object identity is defined to be identity of the implementation pointers. This is in general invalid when comparing pointers to UNO objects (ambiguous class @@ -244,7 +244,7 @@ namespace comphelper } /** less-than operator - + Object order is defined to be the ordering of the implementation pointers. This is in general invalid when comparing pointers to UNO objects (ambiguous class @@ -258,15 +258,15 @@ namespace comphelper { return mpImpl < rhs.mpImpl; } - + private: - + // the interface, hard reference to prevent object from vanishing - ::com::sun::star::uno::Reference< UnoInterfaceType > mxRef; + ::com::sun::star::uno::Reference< UnoInterfaceType > mxRef; // the c++ object, for our internal stuff - ImplementationType* mpImpl; - + ImplementationType* mpImpl; + }; } diff --git a/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx index 236738b9c43c..1b233b1ba5c3 100644 --- a/comphelper/inc/comphelper/interaction.hxx +++ b/comphelper/inc/comphelper/interaction.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 @@ -52,19 +52,19 @@ namespace comphelper */ class OInteractionSelect { - sal_Bool m_bSelected : 1; /// indicates if the select event occured + sal_Bool m_bSelected : 1; /// indicates if the select event occured protected: OInteractionSelect() : m_bSelected(sal_False) { } public: /// determines whether or not this handler was selected - sal_Bool wasSelected() const { return m_bSelected; } + sal_Bool wasSelected() const { return m_bSelected; } /// resets the state to "not selected", so you may reuse the handler - void reset() { m_bSelected = sal_False; } + void reset() { m_bSelected = sal_False; } protected: - void implSelected() { m_bSelected = sal_True; } + void implSelected() { m_bSelected = sal_True; } }; //========================================================================= @@ -95,22 +95,22 @@ namespace comphelper //========================================================================= //= OInteractionApprove //========================================================================= - typedef OInteraction< ::com::sun::star::task::XInteractionApprove > OInteractionApprove; + typedef OInteraction< ::com::sun::star::task::XInteractionApprove > OInteractionApprove; //========================================================================= //= OInteractionDispprove //========================================================================= - typedef OInteraction< ::com::sun::star::task::XInteractionDisapprove > OInteractionDisapprove; + typedef OInteraction< ::com::sun::star::task::XInteractionDisapprove > OInteractionDisapprove; //========================================================================= //= OInteractionAbort //========================================================================= - typedef OInteraction< ::com::sun::star::task::XInteractionAbort > OInteractionAbort; + typedef OInteraction< ::com::sun::star::task::XInteractionAbort > OInteractionAbort; //========================================================================= //= OInteractionRetry //========================================================================= - typedef OInteraction< ::com::sun::star::task::XInteractionRetry > OInteractionRetry; + typedef OInteraction< ::com::sun::star::task::XInteractionRetry > OInteractionRetry; //========================================================================= //= OInteractionPassword @@ -138,17 +138,17 @@ namespace comphelper //========================================================================= //= OInteractionRequest //========================================================================= - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionRequest - > OInteractionRequest_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionRequest + > OInteractionRequest_Base; /** implements an interaction request (<type scope="com.sun.star.task">XInteractionRequest</type>)<p/> at run time, you can freely add any interaction continuation objects */ class COMPHELPER_DLLPUBLIC OInteractionRequest : public OInteractionRequest_Base { ::com::sun::star::uno::Any - m_aRequest; /// the request we represent + m_aRequest; /// the request we represent ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > - m_aContinuations; /// all registered continuations + m_aContinuations; /// all registered continuations public: OInteractionRequest(const ::com::sun::star::uno::Any& _rRequestDescription); @@ -163,7 +163,7 @@ namespace comphelper virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_INTERACTION_HXX_ diff --git a/comphelper/inc/comphelper/legacysingletonfactory.hxx b/comphelper/inc/comphelper/legacysingletonfactory.hxx index d40f828d1384..139efd33bc6f 100644 --- a/comphelper/inc/comphelper/legacysingletonfactory.hxx +++ b/comphelper/inc/comphelper/legacysingletonfactory.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/comphelper/inc/comphelper/listenernotification.hxx b/comphelper/inc/comphelper/listenernotification.hxx index 98143f1d3242..022480def234 100644 --- a/comphelper/inc/comphelper/listenernotification.hxx +++ b/comphelper/inc/comphelper/listenernotification.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/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx index 317d74ae740f..5b991271a978 100644 --- a/comphelper/inc/comphelper/locale.hxx +++ b/comphelper/inc/comphelper/locale.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 @@ -57,17 +57,17 @@ class COMPHELPER_DLLPUBLIC Locale // const public: - + /** @short seperates LANGUAGE and COUNTRY part of an ISO formated Locale. */ static const sal_Unicode SEPERATOR_LC; - + /** @short seperates COUNTRY and VARIANT part of an ISO formated Locale. */ static const sal_Unicode SEPERATOR_CV; - + /** @short seperates COUNTRY and VARIANT part of an ISO formated Locale. @descr Its true for some linux derivates only :-( */ static const sal_Unicode SEPERATOR_CV_LINUX; - + /** @short some predefined Locale objects. */ static const Locale EN_US(); static const Locale EN(); @@ -104,50 +104,50 @@ class COMPHELPER_DLLPUBLIC Locale static const Locale X_NOTRANSLATE(); static const Locale ZH_CN(); static const Locale ZH_TW(); - + //------------------------------------------- // types - + public: - + /** @short will be throw during convertion, if a Locale cant be interpreted. */ struct MalFormedLocaleException { public: ::rtl::OUString Message; - + MalFormedLocaleException() {} - + MalFormedLocaleException(const ::rtl::OUString& sMessage) : Message(sMessage) {} }; - + //------------------------------------------- // member private : //--------------------------------------- - /** @short must be a valid ISO Language Code. - + /** @short must be a valid ISO Language Code. + @descr These codes are the lower-case two-letter codes as defined by ISO-639. You can find a full list of these codes at a number of sites, such as: <BR><a href ="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt"> http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</a> */ ::rtl::OUString m_sLanguage; - + //--------------------------------------- - /** @short must be a valid ISO Country Code. - @descr These codes are the upper-case two-letter codes as defined by ISO-3166. + /** @short must be a valid ISO Country Code. + @descr These codes are the upper-case two-letter codes as defined by ISO-3166. You can find a full list of these codes at a number of sites, such as: <BR><a href="http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html"> http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</a> */ ::rtl::OUString m_sCountry; - + //--------------------------------------- /** @short Variant codes are vendor and browser-specific. @descr For example, use WIN for Windows, MAC for Macintosh, and POSIX for POSIX. @@ -164,40 +164,40 @@ class COMPHELPER_DLLPUBLIC Locale //--------------------------------------- /** @short needed by outside users! - + @descr Otherwise it wouldnt be possible to use any instance of such Locale static ... */ Locale(); - + //--------------------------------------- /** @short construct a Locale from an ISO formated string value. - + @seealso fromISO() - + @param sISO an ISO formated string value, which can be parsed and tokenized into a Lamnguage, Country and Variant part. - + @throw MalFormedLocaleException if conversion failed. */ Locale(const ::rtl::OUString& sISO) throw(MalFormedLocaleException); - + //--------------------------------------- /** @short construct a Locale from language, country and variant. - + @seealso setLanguage() @seealso setCountry() @seealso setVariant() - + @param sLanguage lowercase two-letter ISO-639 code. - + @param sCountry uppercase two-letter ISO-3166 code. - + @param sVariant vendor and browser specific code. */ @@ -207,18 +207,18 @@ class COMPHELPER_DLLPUBLIC Locale //--------------------------------------- /** @short copy constructor. - + @param aCopy the copy object. */ Locale(const Locale& aCopy); - + //--------------------------------------- /** @short returns the language code for this locale. - + @descr That will either be the empty string or a lowercase ISO 639 code. - + @return [string] the language code. */ @@ -226,18 +226,18 @@ class COMPHELPER_DLLPUBLIC Locale //--------------------------------------- /** @short returns the country/region code for this locale. - + @descr That will either be the empty string or an upercase ISO 3166 2-letter code. - + @return [string] the country code. */ ::rtl::OUString getCountry() const; - + //--------------------------------------- /** @short returns the variant code for this locale. - + @return [string] the variant code. */ @@ -245,10 +245,10 @@ class COMPHELPER_DLLPUBLIC Locale //--------------------------------------- /** @short set the new language code for this locale. - + @descr That will either be the empty string or a lowercase ISO 639 code. - + @param sLanguage the language code. */ @@ -256,45 +256,45 @@ class COMPHELPER_DLLPUBLIC Locale //--------------------------------------- /** @short set the new country/region code for this locale. - + @descr That will either be the empty string or an upercase ISO 3166 2-letter code. - + @param sCountry the country code. */ void setCountry(const ::rtl::OUString& sCountry); - + //--------------------------------------- /** @short set the new variant code for this locale. - + @param sVariant the variant code. */ void setVariant(const ::rtl::OUString& sVariant); - + //--------------------------------------- /** @short take over new Locale informations. - + @seealso Locale(const ::rtl::OUString& sISO) - + @param sISO an ISO formated string value, which can be parsed and tokenized into a Lamnguage, Country and Variant part. e.g. "en-US" or "en-US_WIN" - + @throw MalFormedLocaleException if conversion failed. */ void fromISO(const ::rtl::OUString& sISO) throw(MalFormedLocaleException); - + //--------------------------------------- /** @short converts this Locale to an ISO formated string value. - + @descr The different parts of this Locale will be assempled e.g. to "en-US" or "en-US_WIN" - + @return [string] the ISO formated string. */ @@ -302,13 +302,13 @@ class COMPHELPER_DLLPUBLIC Locale //--------------------------------------- /** @short check, if two Locale objects are equals. - + @descr All parts of a Locale (means Language, Country and Variant) will be checked. - + @param aComparable the Locale object for compare. - + @return [boolean] TRUE if both objects uses the same values for Language, Country and Variant. @@ -318,10 +318,10 @@ class COMPHELPER_DLLPUBLIC Locale //--------------------------------------- /** @short check, if two Locale objects uses the same language. - + @descr The Country and Variant parts of a Locale wont be checked here. - + @return [boolean] TRUE if both objects uses the same Language value. @@ -331,47 +331,47 @@ class COMPHELPER_DLLPUBLIC Locale //--------------------------------------- /** @short search for an equal or at least for a similar Locale in a list of possible ones. - + @descr First it searches for a Locale, which is equals to the reference Locale. (means: same Language, Country, Variant) - + If the reference Locale couldnt be located, it will tried again - but we are checking for "similar" Locales then. (means: same Language) - + If no similar Locale could be located, we search for a Locale "en-US" inside the given Locale list. - + If "en-US" could not be located, we search for a Locale "en" inside the given list. - + If no "same" nor any "similar" locale could be found, we try "x-default" and "x-notranslate" explicitly. Sometimes localized variables are optimized and doesnt use localzation realy. E.g. in case the localized value is a fix product name. - + If no locale match till now, we use any other existing locale, which exists inside the set of given ones! - - @seealso equals() + + @seealso equals() @seealso similar() - + @param lISOList the list of possible Locales (as formated ISO strings). - + @param sReferenceISO the reference Locale, which should be searched if its equals or similar to any Locale inside the provided Locale list. - + @return An iterator, which points to the found element inside the given Locale list. If no matching Locale could be found, it points - to the end of the list. - + to the end of the list. + @throw [MalFormedLocaleException] if at least one ISO formated string couldnt be converted to a valid Locale Object. @@ -379,19 +379,19 @@ class COMPHELPER_DLLPUBLIC Locale static ::std::vector< ::rtl::OUString >::const_iterator getFallback(const ::std::vector< ::rtl::OUString >& lISOList , const ::rtl::OUString& sReferenceISO) throw(MalFormedLocaleException); - + //--------------------------------------- /** @short search for the next possible fallback locale. - + @descr Instead of getFallback(vector<>, string) this method uses the given locale and decide by using an algorithm which locale can be the next possible one. - + Algorithm: - if locale has country return language only - if locale different "en-US" return "en-US" - if locale "en-US" return "en" - + @param aLocale [in/out]! the incoming value will be used to start search for a possible fallback ... @@ -399,39 +399,39 @@ class COMPHELPER_DLLPUBLIC Locale will be used for return too. @return TRUE if the parameter aLocale contains a new fallback value; - FALSE otherwise. + FALSE otherwise. */ - static sal_Bool getFallback(Locale& aLocale); + static sal_Bool getFallback(Locale& aLocale); //--------------------------------------- /** @short assign elements of another locale to this instance. - + @param rCopy another locale object. */ void operator=(const Locale& rCopy); - + //--------------------------------------- /** @short check if two Locale objects are equals. - + @seealso equals() - + @param aComparable the Locale object for compare. - + @return [boolean] TRUE if both objects uses the same values for Language, Country and Variant. */ sal_Bool operator==(const Locale& aComparable) const; - + //--------------------------------------- /** @short check if two Locale objects are different. - + @param aComparable the Locale object for compare. - + @return [boolean] TRUE if at least one part of such Locale isnt the same. diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx index e332f0541594..0afdbb4b19f4 100644 --- a/comphelper/inc/comphelper/logging.hxx +++ b/comphelper/inc/comphelper/logging.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 @@ -578,7 +578,7 @@ namespace comphelper @param _rLoggerName the name of the logger to work with. If empty, the office-wide default logger will be used. - + */ ResourceBasedEventLogger( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, @@ -595,7 +595,7 @@ namespace comphelper @param _pAsciiLoggerName the ASCII name of the logger to work with. If NULL, the office-wide default logger will be used. - + */ ResourceBasedEventLogger( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, diff --git a/comphelper/inc/comphelper/make_shared_from_uno.hxx b/comphelper/inc/comphelper/make_shared_from_uno.hxx index 4cbb3a17c362..9f01bb34c701 100644 --- a/comphelper/inc/comphelper/make_shared_from_uno.hxx +++ b/comphelper/inc/comphelper/make_shared_from_uno.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 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> { /** Makes a boost::shared_ptr from a ref-counted UNO object pointer. This makes sense if the object is used via UNO (implementing some X interface) and also internally using its implementation class, e.g. - + <pre> boost::shared_ptr<MyUnoImpl> const ptr( comphelper::make_shared_from_UNO( new MyUnoImpl ) ); @@ -54,12 +54,12 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> { takeSharedPtr( ptr ); ... </pre> - + @attention The shared_ptr operates on a separate reference counter, so weak pointers (boost::weak_ptr) are invalidated when the last shared_ptr is destroyed, although the UNO object may still be alive. - + @param p object pointer @return shared_ptr to object */ diff --git a/comphelper/inc/comphelper/makesequence.hxx b/comphelper/inc/comphelper/makesequence.hxx index d4e724309e94..ab663fb82bfa 100644 --- a/comphelper/inc/comphelper/makesequence.hxx +++ b/comphelper/inc/comphelper/makesequence.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 @@ -48,15 +48,15 @@ inline ::com::sun::star::uno::Sequence<T> makeSequence( T const& element ) p[n_] = BOOST_PP_CAT(element, n_); /** The following preprocessor repetitions generate functions like - + <pre> template <typename T> inline ::com::sun::star::uno::Sequence<T> makeSequence( T const& element0, T const& element1, ... ); </pre> - + which make a sequence out of the passed elements. - + The maximum number of elements can be set by defining COMPHELPER_MAKESEQUENCE_MAX_ARGS; its default is 12. */ diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx index 729850f82a10..50e20f7890a0 100644 --- a/comphelper/inc/comphelper/mediadescriptor.hxx +++ b/comphelper/inc/comphelper/mediadescriptor.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 @@ -218,22 +218,22 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap //--------------------------------------- /** Inserts a value into the sequence contained in the property 'ComponentData' of the media descriptor. - + @descr The property 'ComponentData' should be empty or should contain a value of type ComponentDataSequence (see above). The passed value will be inserted into the sequence, or, if already existing, will be overwritten. - + @param rName The name of the value to be inserted into the sequence of the 'ComponentData' property. - + @param rValue The value to be inserted into the sequence of the 'ComponentData' property. */ void setComponentDataEntry( const ::rtl::OUString& rName, const ::com::sun::star::uno::Any& rValue ); - + //--------------------------------------- /** Removes a value from the sequence contained in the property 'ComponentData' of the media descriptor. diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx index 613d3b591783..f62dbfb8df36 100644 --- a/comphelper/inc/comphelper/mimeconfighelper.hxx +++ b/comphelper/inc/comphelper/mimeconfighelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ class COMPHELPER_DLLPUBLIC MimeConfigurationHelper ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xObjectConfig; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xVerbsConfig; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMediaTypeConfig; - + public: MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); @@ -65,7 +65,7 @@ public: GetConfigurationByPath( const ::rtl::OUString& aPath ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetObjConfiguration(); - + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetVerbsConfiguration(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetMediaTypeConfiguration(); @@ -113,7 +113,7 @@ public: ::rtl::OUString UpdateMediaDescriptorWithFilterName( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject ); - sal_Bool AddFilterNameCheckOwnFile( + sal_Bool AddFilterNameCheckOwnFile( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ); ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion ); diff --git a/comphelper/inc/comphelper/namecontainer.hxx b/comphelper/inc/comphelper/namecontainer.hxx index b251c553efd2..655fcd88f332 100644 --- a/comphelper/inc/comphelper/namecontainer.hxx +++ b/comphelper/inc/comphelper/namecontainer.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/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx index 04f68bc102d2..b5c321ab092c 100644 --- a/comphelper/inc/comphelper/namedvaluecollection.hxx +++ b/comphelper/inc/comphelper/namedvaluecollection.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/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx index a955c9624518..aa0cb6f1b0bc 100644 --- a/comphelper/inc/comphelper/numberedcollection.hxx +++ b/comphelper/inc/comphelper/numberedcollection.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 @@ -60,12 +60,12 @@ namespace comphelper{ //_______________________________________________ // definitions -/** @short defines a collection of UNO components, where every component will get it's own unique number. +/** @short defines a collection of UNO components, where every component will get it's own unique number. @descr Such number will be unique at runtime only ... but it supports fragmentation. Note: This collection uses weak refrences only to know her components. So lifetime of thise components must be controlled outside. - + @threadsafe */ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex @@ -74,120 +74,120 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex //------------------------------------------- // types, const private: - + struct TNumberedItem { css::uno::WeakReference< css::uno::XInterface > xItem; ::sal_Int32 nNumber; }; - - typedef ::std::hash_map< + + typedef ::std::hash_map< long , TNumberedItem , ::std::hash< long > , ::std::equal_to< long > > TNumberedItemHash; - + typedef ::std::vector< long > TDeadItemList; - + //------------------------------------------- // interface public: //--------------------------------------- /** @short lightweight constructor. - */ + */ NumberedCollection(); - + //--------------------------------------- /** @short free all internaly used resources. - */ + */ virtual ~NumberedCollection(); - + //--------------------------------------- /** set an outside component which uses this container and must be set as source of all broadcasted messages, exceptions. - + It's holded weak only so we do not need any complex dispose sessions. - + Note: Passing NULL as parameter will be allowed. It will reset the internal member reference only. - + @param xOwner the new owner of this collection. */ void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner); - + //--------------------------------------- /** set the localized prefix to be used for untitled components. - + Localization has to be done outside. This container will return those value then. There are no further checks. Its up to you to define a suitable string here :-) - + @param sPrefix the new prefix for untitled components. */ void setUntitledPrefix(const ::rtl::OUString& sPrefix); - + //--------------------------------------- /** @see css.frame.XUntitledNumbers */ virtual ::sal_Int32 SAL_CALL leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ); - + //--------------------------------------- /** @see css.frame.XUntitledNumbers */ virtual void SAL_CALL releaseNumber(::sal_Int32 nNumber) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ); - + //--------------------------------------- /** @see css.frame.XUntitledNumbers */ virtual void SAL_CALL releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ); - + //--------------------------------------- /** @see css.frame.XUntitledNumbers */ virtual ::rtl::OUString SAL_CALL getUntitledPrefix() throw (css::uno::RuntimeException); - + //------------------------------------------- // internal private: //--------------------------------------- /** @short trys to find an unique number not already used within this collection. - + @descr It reuses the smalles number which isnt used by any component of this collection. (fragmentation!) If collection is full (means there is no free number) the special value INVALID_NUMBER will be returned. - + @note Those method cant be called within a multithreaded environment .. Because such number wont be "reserved" for the calli of these method it can happen that two calls returns the same number (reasoned by the fact that first calli doesnt used the returned number already. - + So the outside code has to make sure that retrieving and using of those number will be an atomic operation. - + @return an unique number or special value INVALID_NUMBER if collection is full. - */ + */ ::sal_Int32 impl_searchFreeNumber (); - + void impl_cleanUpDeadItems ( TNumberedItemHash& lItems , const TDeadItemList& lDeadItems); - + //------------------------------------------- // member private: - + /// localized string to be used for untitled components ::rtl::OUString m_sUntitledPrefix; - + /// cache of all "leased numbers" and its bound components TNumberedItemHash m_lComponents; - + /// used as source of broadcasted messages or exceptions (can be null !) css::uno::WeakReference< css::uno::XInterface > m_xOwner; }; diff --git a/comphelper/inc/comphelper/numbers.hxx b/comphelper/inc/comphelper/numbers.hxx index 179889c7b720..64f7826fc47b 100644 --- a/comphelper/inc/comphelper/numbers.hxx +++ b/comphelper/inc/comphelper/numbers.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,9 +39,9 @@ namespace comphelper { //......................................................................... - namespace staruno = ::com::sun::star::uno; - namespace starlang = ::com::sun::star::lang; - namespace starutil = ::com::sun::star::util; + namespace staruno = ::com::sun::star::uno; + namespace starlang = ::com::sun::star::lang; + namespace starutil = ::com::sun::star::util; /// returns the ::com::sun::star::util::NumberFormat of the given key under the given formats COMPHELPER_DLLPUBLIC sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey); @@ -68,7 +68,7 @@ namespace comphelper ); //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_NUMBERS_HXX_ diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx index 345790e733f2..b384c4167ddc 100644 --- a/comphelper/inc/comphelper/officeresourcebundle.hxx +++ b/comphelper/inc/comphelper/officeresourcebundle.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/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx index 8043ea818afd..84d5dc73febc 100644 --- a/comphelper/inc/comphelper/ofopxmlhelper.hxx +++ b/comphelper/inc/comphelper/ofopxmlhelper.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/comphelper/inc/comphelper/optional.hxx b/comphelper/inc/comphelper/optional.hxx index 2ffec9b55b02..df92b9c275c5 100644 --- a/comphelper/inc/comphelper/optional.hxx +++ b/comphelper/inc/comphelper/optional.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/comphelper/inc/comphelper/optionalvalue.hxx b/comphelper/inc/comphelper/optionalvalue.hxx index 3bc5cdc7a19c..4cc4f293f603 100644 --- a/comphelper/inc/comphelper/optionalvalue.hxx +++ b/comphelper/inc/comphelper/optionalvalue.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 @@ -57,7 +57,7 @@ namespace comphelper { public: typedef Element ValueType; - + /** Default-construct the value. A default-constructed value is not valid. You have to @@ -141,13 +141,13 @@ namespace comphelper bool exportValue( ::com::sun::star::uno::Any& o_rAny ) { o_rAny.clear(); - + if( isValid() ) { if( !(o_rAny <<= getValue()) ) return false; } - + return true; } @@ -164,14 +164,14 @@ namespace comphelper bool importValue( const ::com::sun::star::uno::Any& rAny ) { clearValue(); - + if( rAny.hasValue() ) { Element tmp; - + if( !(rAny >>= tmp) ) return false; - + setValue( tmp ); } @@ -179,8 +179,8 @@ namespace comphelper } private: - Element maValue; - bool mbValid; + Element maValue; + bool mbValid; }; } diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx b/comphelper/inc/comphelper/oslfile2streamwrap.hxx index e4fad24c0db2..d6366669b470 100644 --- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx +++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,21 +37,21 @@ namespace comphelper { - namespace stario = ::com::sun::star::io; - namespace staruno = ::com::sun::star::uno; + namespace stario = ::com::sun::star::io; + namespace staruno = ::com::sun::star::uno; //================================================================== // FmUnoIOStream, // stream zum schreiben un lesen von Daten, basieren auf File //================================================================== -struct InputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XInputStream> +struct InputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XInputStream> {}; class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public InputStreamWrapper_Base { - ::osl::Mutex m_aMutex; - ::osl::File* m_pFile; - sal_Bool m_bFileOwner : 1; + ::osl::Mutex m_aMutex; + ::osl::File* m_pFile; + sal_Bool m_bFileOwner : 1; public: OSLInputStreamWrapper(::osl::File& _rStream); @@ -59,41 +59,41 @@ public: virtual ~OSLInputStreamWrapper(); // UNO Anbindung - virtual void SAL_CALL acquire() throw() + virtual void SAL_CALL acquire() throw() { InputStreamWrapper_Base::acquire(); } - virtual void SAL_CALL release() throw() + virtual void SAL_CALL release() throw() { InputStreamWrapper_Base::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) { return InputStreamWrapper_Base::queryInterface(_rType); } // stario::XInputStream - virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); - virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); - virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, staruno::RuntimeException); - virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException); + virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); + virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); + virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, staruno::RuntimeException); + virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException); }; //================================================================== // FmUnoOutStream, // Datensenke fuer Files //================================================================== -struct OutputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XOutputStream> +struct OutputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XOutputStream> {}; class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public OutputStreamWrapper_Base { - ::osl::File& rFile; + ::osl::File& rFile; public: OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { } // UNO Anbindung - virtual void SAL_CALL acquire() throw() + virtual void SAL_CALL acquire() throw() { OutputStreamWrapper_Base::acquire(); } - virtual void SAL_CALL release() throw() + virtual void SAL_CALL release() throw() { OutputStreamWrapper_Base::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) { return OutputStreamWrapper_Base::queryInterface(_rType); } // stario::XOutputStream @@ -102,7 +102,7 @@ public: virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); }; -} // namespace comphelper +} // namespace comphelper #endif // _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_ diff --git a/comphelper/inc/comphelper/otransactedfilestream.hxx b/comphelper/inc/comphelper/otransactedfilestream.hxx index 248aa22f02eb..b0c6cdebfa24 100644 --- a/comphelper/inc/comphelper/otransactedfilestream.hxx +++ b/comphelper/inc/comphelper/otransactedfilestream.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 @@ -66,7 +66,7 @@ class COMPHELPER_DLLPUBLIC OTruncatedTransactedFileStream ::com::sun::star::beans::XPropertySetInfo, ::com::sun::star::beans::XPropertySet > { - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; TTFileStreamData_Impl* m_pStreamData; void CommonInit_Impl( diff --git a/comphelper/inc/comphelper/processfactory.hxx b/comphelper/inc/comphelper/processfactory.hxx index b20d7302241d..e06776e46a6e 100644 --- a/comphelper/inc/comphelper/processfactory.hxx +++ b/comphelper/inc/comphelper/processfactory.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/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx index 6286e9d79088..2a045ff0c96e 100644 --- a/comphelper/inc/comphelper/propagg.hxx +++ b/comphelper/inc/comphelper/propagg.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,9 +65,9 @@ namespace internal sal_Bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; } }; - typedef std::map< sal_Int32, OPropertyAccessor, ::std::less< sal_Int32 > > PropertyAccessorMap; - typedef PropertyAccessorMap::iterator PropertyAccessorMapIterator; - typedef PropertyAccessorMap::const_iterator ConstPropertyAccessorMapIterator; + typedef std::map< sal_Int32, OPropertyAccessor, ::std::less< sal_Int32 > > PropertyAccessorMap; + typedef PropertyAccessorMap::iterator PropertyAccessorMapIterator; + typedef PropertyAccessorMap::const_iterator ConstPropertyAccessorMapIterator; } //================================================================== @@ -77,12 +77,12 @@ namespace internal class IPropertyInfoService { public: - /** get the prefered handle for the given property - @param _rName the property name - @return the handle the property should be refered by, or -1 if there are no + /** get the prefered handle for the given property + @param _rName the property name + @return the handle the property should be refered by, or -1 if there are no preferences for the given property */ - virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName) = 0; + virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName) = 0; }; /** @@ -90,35 +90,35 @@ public: * aggregating property sets */ -#define DEFAULT_AGGREGATE_PROPERTY_ID 10000 +#define DEFAULT_AGGREGATE_PROPERTY_ID 10000 //------------------------------------------------------------------ class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper: public ::cppu::IPropertyArrayHelper { friend class OPropertySetAggregationHelper; protected: - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> m_aProperties; - internal::PropertyAccessorMap m_aPropertyAccessors; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> m_aProperties; + internal::PropertyAccessorMap m_aPropertyAccessors; public: /** construct the object. - @param _rProperties the properties of the object doing the aggregation. These properties + @param _rProperties the properties of the object doing the aggregation. These properties are used without any checks, so the caller has to ensure that the names and handles are valid. - @param _rAggProperties the properties of the aggregate, usually got via an call to getProperties on the + @param _rAggProperties the properties of the aggregate, usually got via an call to getProperties on the XPropertySetInfo of the aggregate. The names of the properties are used without any checks, so the caller has to ensure that there are no doubles. The handles are stored for later quick access, but the outside-handles the aggregate properties get depend from the following two parameters. - @param _pInfoService + @param _pInfoService If not NULL, the object pointed to is used to calc handles which should be used for refering the aggregate's properties from outside. If one of the properties returned from the info service conflict with other handles alread present (e.g. through _rProperties), the property is handled as if -1 was returned. If NULL (or, for a special property, a call to getPreferedPropertyId returns -1), the aggregate property(ies) get a new handle which they can be refered by from outside. - @param _nFirstAggregateId + @param _nFirstAggregateId if the object is about to create new handles for the aggregate properties, it uses id's ascending from this given id. No checks are made if the handle range determined by _nFirstAggregateId conflicts with other @@ -148,12 +148,12 @@ public: virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames ); /** returns information about a property of the aggregate. - @param _pPropName points to a string to recieve the property name. No name is returned if this is NULL. - @param _pOriginalHandle points to a sal_Int32 to recieve the original property hande. No original handle is returned + @param _pPropName points to a string to recieve the property name. No name is returned if this is NULL. + @param _pOriginalHandle points to a sal_Int32 to recieve the original property hande. No original handle is returned if this is NULL. - @param _nHandle the handle of the property as got by, for instance, fillHandles + @param _nHandle the handle of the property as got by, for instance, fillHandles - @return sal_True, if _nHandle marks an aggregate property, otherwise sal_False + @return sal_True, if _nHandle marks an aggregate property, otherwise sal_False */ virtual sal_Bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const; @@ -181,7 +181,7 @@ public: When using the XPropertySetInfo of the aggregate set to determine the existence of a property, then this would return false positives.</p> */ - PropertyOrigin classifyProperty( const ::rtl::OUString& _rName ); + PropertyOrigin classifyProperty( const ::rtl::OUString& _rName ); protected: const ::com::sun::star::beans::Property* findPropertyByName(const ::rtl::OUString& _rName) const; @@ -199,7 +199,7 @@ namespace internal * supports at least XPropertySet and XMultiPropertySet * */ -class COMPHELPER_DLLPUBLIC OPropertySetAggregationHelper :public OPropertyStateHelper +class COMPHELPER_DLLPUBLIC OPropertySetAggregationHelper :public OPropertyStateHelper ,public ::com::sun::star::beans::XPropertiesChangeListener ,public ::com::sun::star::beans::XVetoableChangeListener { @@ -227,8 +227,8 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertySet - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertiesChangeListener virtual void SAL_CALL propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) throw(::com::sun::star::uno::RuntimeException); @@ -237,13 +237,13 @@ public: virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // OPropertySetHelper /** still waiting to be overwritten ... @@ -267,7 +267,7 @@ protected: virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; virtual void SAL_CALL disposing(); - sal_Int32 getOriginalHandle( sal_Int32 _nHandle ) const; + sal_Int32 getOriginalHandle( sal_Int32 _nHandle ) const; ::rtl::OUString getPropertyName( sal_Int32 _nHandle ) const; /** declares the property with the given (public) handle as one to be forwarded to the aggregate @@ -323,7 +323,7 @@ protected: }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_PROPERTY_AGGREGATION_HXX_ diff --git a/comphelper/inc/comphelper/proparrhlp.hxx b/comphelper/inc/comphelper/proparrhlp.hxx index 6af317420327..d9fd6b7cdcca 100644 --- a/comphelper/inc/comphelper/proparrhlp.hxx +++ b/comphelper/inc/comphelper/proparrhlp.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,13 +45,13 @@ namespace comphelper { //......................................................................... - namespace staruno = ::com::sun::star::uno; - namespace starbeans = ::com::sun::star::beans; + namespace staruno = ::com::sun::star::uno; + namespace starbeans = ::com::sun::star::beans; //================================================================== -template <typename TYPE> struct OPropertyArrayUsageHelperMutex +template <typename TYPE> struct OPropertyArrayUsageHelperMutex : public rtl::Static< ::osl::Mutex, OPropertyArrayUsageHelperMutex<TYPE> > {}; @@ -59,13 +59,13 @@ template <class TYPE> class OPropertyArrayUsageHelper { protected: - static sal_Int32 s_nRefCount; - static ::cppu::IPropertyArrayHelper* s_pProps; + static sal_Int32 s_nRefCount; + static ::cppu::IPropertyArrayHelper* s_pProps; public: OPropertyArrayUsageHelper(); virtual ~OPropertyArrayUsageHelper() - { // ARGHHHHHHH ..... would like to implement this after the class + { // ARGHHHHHHH ..... would like to implement this after the class // definition (as we do with all other methods) but SUNPRO 5 compiler // (linker) doesn't like this ::osl::MutexGuard aGuard(OPropertyArrayUsageHelperMutex<TYPE>::get()); @@ -80,7 +80,7 @@ public: /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the class, which is created if neccessary. */ - ::cppu::IPropertyArrayHelper* getArrayHelper(); + ::cppu::IPropertyArrayHelper* getArrayHelper(); protected: /** used to implement the creation of the array helper which is shared amongst all instances of the class. @@ -90,7 +90,7 @@ protected: <BR> as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. - @return an pointer to the newly created array helper. Must not be NULL. + @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const = 0; }; @@ -106,8 +106,8 @@ protected: properties. <BR> The method gets called with Mutex acquired. - @param _rProps out parameter to be filled with the property descriptions of your own class - @param _rAggregateProps out parameter to be filled with the properties of your aggregate. + @param _rProps out parameter to be filled with the property descriptions of your own class + @param _rAggregateProps out parameter to be filled with the properties of your aggregate. */ virtual void fillProperties( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps, @@ -132,11 +132,11 @@ protected: }; //------------------------------------------------------------------ -template<class TYPE> -sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; +template<class TYPE> +sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; -template<class TYPE> -::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL; +template<class TYPE> +::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL; //------------------------------------------------------------------ template <class TYPE> diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx index 2cb9c662ee80..5bd04b6756f9 100644 --- a/comphelper/inc/comphelper/property.hxx +++ b/comphelper/inc/comphelper/property.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 @@ -46,12 +46,12 @@ namespace comphelper { //......................................................................... - namespace starbeans = ::com::sun::star::beans; - namespace staruno = ::com::sun::star::uno; + namespace starbeans = ::com::sun::star::beans; + namespace staruno = ::com::sun::star::uno; /** compare two properties by name */ - struct PropertyStringLessFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool > + struct PropertyStringLessFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool > { // ................................................................ inline bool operator()( const ::com::sun::star::beans::Property& lhs, const ::rtl::OUString& rhs ) const @@ -77,7 +77,7 @@ namespace comphelper //-------------------------------------------------------------------------- /** compare two properties by name */ - struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool > + struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool > { // ................................................................ inline bool operator()( const ::com::sun::star::beans::Property& lhs, const ::rtl::OUString& rhs ) const @@ -119,20 +119,20 @@ COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& //------------------------------------------------------------------ /** within the given property sequence, modify attributes of a special property - @param _rProps the sequence of properties to search in - @param _sPropName the name of the property which's attributes should be modified - @param _nAddAttrib the attributes which should be added - @param _nRemoveAttrib the attributes which should be removed + @param _rProps the sequence of properties to search in + @param _sPropName the name of the property which's attributes should be modified + @param _nAddAttrib the attributes which should be added + @param _nRemoveAttrib the attributes which should be removed */ COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _rProps, const ::rtl::OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib); //------------------------------------------------------------------ -/** check if the given set has the given property. +/** check if the given set has the given property. */ COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const rtl::OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet); //------------------------------------------------------------------ -/** copy properties between property sets, in compliance with the property +/** copy properties between property sets, in compliance with the property attributes of the target object */ COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference<starbeans::XPropertySet>& _rxSource, @@ -143,13 +143,13 @@ COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference<starbeans::XPr //================================================================== /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue - @param _rConvertedValue the conversion result (if successfull) - @param _rOldValue the old value of the property, calculated from _rCurrentValue - @param _rValueToSet the new value which is about to be set - @param _rCurrentValue the current value of the property - @return sal_True, if the value could be converted and has changed + @param _rConvertedValue the conversion result (if successfull) + @param _rOldValue the old value of the property, calculated from _rCurrentValue + @param _rValueToSet the new value which is about to be set + @param _rCurrentValue the current value of the property + @return sal_True, if the value could be converted and has changed sal_False, if the value could be converted and has not changed - @exception InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument) + @exception InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument) */ template <class TYPE> sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const TYPE& _rCurrentValue) @@ -167,13 +167,13 @@ sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& / } /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue for enum values - @param _rConvertedValue the conversion result (if successfull) - @param _rOldValue the old value of the property, calculated from _rCurrentValue - @param _rValueToSet the new value which is about to be set - @param _rCurrentValue the current value of the property - @return sal_True, if the value could be converted and has changed + @param _rConvertedValue the conversion result (if successfull) + @param _rOldValue the old value of the property, calculated from _rCurrentValue + @param _rValueToSet the new value which is about to be set + @param _rCurrentValue the current value of the property + @return sal_True, if the value could be converted and has changed sal_False, if the value could be converted and has not changed - @exception InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument) + @exception InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument) */ template <class ENUMTYPE> sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const ENUMTYPE& _rCurrentValue) @@ -197,13 +197,13 @@ sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::An } /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue for boolean properties - @param _rConvertedValue the conversion result (if successfull) - @param _rOldValue the old value of the property, calculated from _rCurrentValue - @param _rValueToSet the new value which is about to be set - @param _rCurrentValue the current value of the property - @return sal_True, if the value could be converted and has changed + @param _rConvertedValue the conversion result (if successfull) + @param _rOldValue the old value of the property, calculated from _rCurrentValue + @param _rValueToSet the new value which is about to be set + @param _rCurrentValue the current value of the property + @return sal_True, if the value could be converted and has changed sal_False, if the value could be converted and has not changed - @exception InvalidArgumentException thrown if the value could not be converted to a boolean type + @exception InvalidArgumentException thrown if the value could not be converted to a boolean type */ inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, sal_Bool _bCurrentValue) { @@ -220,14 +220,14 @@ inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno: } /** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue - @param _rConvertedValue the conversion result (if successfull) - @param _rOldValue the old value of the property, calculated from _rCurrentValue - @param _rValueToSet the new value which is about to be set - @param _rCurrentValue the current value of the property - @param _rExpectedType the type which the property should have (if not void) - @return sal_True, if the value could be converted and has changed + @param _rConvertedValue the conversion result (if successfull) + @param _rOldValue the old value of the property, calculated from _rCurrentValue + @param _rValueToSet the new value which is about to be set + @param _rCurrentValue the current value of the property + @param _rExpectedType the type which the property should have (if not void) + @return sal_True, if the value could be converted and has changed sal_False, if the value could be converted and has not changed - @exception InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument) + @exception InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument) */ COMPHELPER_DLLPUBLIC sal_Bool tryPropertyValue(staruno::Any& _rConvertedValue, staruno::Any& _rOldValue, const staruno::Any& _rValueToSet, const staruno::Any& _rCurrentValue, const staruno::Type& _rExpectedType); diff --git a/comphelper/inc/comphelper/propertybag.hxx b/comphelper/inc/comphelper/propertybag.hxx index 74aa87d71517..8188cca85cca 100644 --- a/comphelper/inc/comphelper/propertybag.hxx +++ b/comphelper/inc/comphelper/propertybag.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/comphelper/inc/comphelper/propertycontainer.hxx b/comphelper/inc/comphelper/propertycontainer.hxx index 49961e559ea7..0091cd21e3ba 100644 --- a/comphelper/inc/comphelper/propertycontainer.hxx +++ b/comphelper/inc/comphelper/propertycontainer.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 @@ -90,7 +90,7 @@ protected: }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_PROPERTYCONTAINER_HXX_ diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx index 42bfe1f2de8e..cfb095f016e4 100644 --- a/comphelper/inc/comphelper/propertycontainerhelper.hxx +++ b/comphelper/inc/comphelper/propertycontainerhelper.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 @@ -84,19 +84,19 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription */ class COMPHELPER_DLLPUBLIC OPropertyContainerHelper { - typedef ::std::vector< ::com::sun::star::uno::Any > PropertyContainer; - typedef PropertyContainer::iterator PropertyContainerIterator; - typedef PropertyContainer::const_iterator ConstPropertyContainerIterator; - PropertyContainer m_aHoldProperties; + typedef ::std::vector< ::com::sun::star::uno::Any > PropertyContainer; + typedef PropertyContainer::iterator PropertyContainerIterator; + typedef PropertyContainer::const_iterator ConstPropertyContainerIterator; + PropertyContainer m_aHoldProperties; // the properties which are hold by this class' instance, not the derived one's private: - typedef ::std::vector< PropertyDescription > Properties; - typedef Properties::iterator PropertiesIterator; - typedef Properties::const_iterator ConstPropertiesIterator; - Properties m_aProperties; + typedef ::std::vector< PropertyDescription > Properties; + typedef Properties::iterator PropertiesIterator; + typedef Properties::const_iterator ConstPropertiesIterator; + Properties m_aProperties; - sal_Bool m_bUnused; + sal_Bool m_bUnused; protected: OPropertyContainerHelper(); @@ -104,42 +104,42 @@ protected: /** register a property. The property is represented through a member of the derived class which calls this methdod. - @param _rName the name of the property - @param _nHandle the handle of the property - @param _nAttributes the attributes of the property - @param _pPointerToMember the pointer to the member representing the property + @param _rName the name of the property + @param _nHandle the handle of the property + @param _nAttributes the attributes of the property + @param _pPointerToMember the pointer to the member representing the property within the derived class. - @param _rMemberType the cppu type of the property represented by the object + @param _rMemberType the cppu type of the property represented by the object to which _pPointerToMember points. */ - void registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, + void registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType); /** register a property. The property is represented through a ::com::sun::star::uno::Any member of the derived class which calls this methdod. - @param _rName the name of the property - @param _nHandle the handle of the property - @param _nAttributes the attributes of the property - @param _pPointerToMember the pointer to the member representing the property + @param _rName the name of the property + @param _nHandle the handle of the property + @param _nAttributes the attributes of the property + @param _pPointerToMember the pointer to the member representing the property within the derived class, which has to be a ::com::sun::star::uno::Any. - @param _rExpectedType the expected type of the property. NOT the type of the object to which + @param _rExpectedType the expected type of the property. NOT the type of the object to which _pPointerToMember points (this is always an Any). */ - void registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, + void registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType); /** register a property. The repository will create an own object holding this property, so there is no need to declare an extra member in your derived class - @param _rName the name of the property - @param _nHandle the handle of the property - @param _nAttributes the attributes of the property - @param _rType the type of the property - @param _pInitialValue the initial value of the property. May be null if _nAttributes includes + @param _rName the name of the property + @param _nHandle the handle of the property + @param _nAttributes the attributes of the property + @param _rType the type of the property + @param _pInitialValue the initial value of the property. May be null if _nAttributes includes the ::com::sun::star::beans::PropertyAttribute::MAYBEVOID flag. Else it must be a pointer to an object of the type described by _rType. */ - void registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, + void registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue); /** revokes a previously registered property @@ -184,14 +184,14 @@ protected: @param _rProps initial property sequence which is to be extended */ - void describeProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps) const; + void describeProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps) const; /** modify the attributes of an already registered property. You may want to use this if you're a derived from OPropertyContainer indirectly and want to override some settings your base class did. */ - void modifyAttributes(sal_Int32 _nHandle, sal_Int32 _nAddAttrib, sal_Int32 _nRemoveAttrib); + void modifyAttributes(sal_Int32 _nHandle, sal_Int32 _nAddAttrib, sal_Int32 _nRemoveAttrib); /** retrieves the description for a registered property @throw com::sun::star::beans::UnknownPropertyException @@ -202,10 +202,10 @@ protected: private: /// insertion of _rProp into m_aProperties, keeping the sort order - COMPHELPER_DLLPRIVATE void implPushBackProperty(const PropertyDescription& _rProp); + COMPHELPER_DLLPRIVATE void implPushBackProperty(const PropertyDescription& _rProp); /// search the PropertyDescription for the given handle (within m_aProperties) - COMPHELPER_DLLPRIVATE PropertiesIterator searchHandle(sal_Int32 _nHandle); + COMPHELPER_DLLPRIVATE PropertiesIterator searchHandle(sal_Int32 _nHandle); private: COMPHELPER_DLLPRIVATE OPropertyContainerHelper( const OPropertyContainerHelper& ); // never implemented @@ -213,7 +213,7 @@ private: }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // COMPHELPER_PROPERTYCONTAINERHELPER_HXX diff --git a/comphelper/inc/comphelper/propertysethelper.hxx b/comphelper/inc/comphelper/propertysethelper.hxx index ea6204d6795f..e65a5bc54607 100644 --- a/comphelper/inc/comphelper/propertysethelper.hxx +++ b/comphelper/inc/comphelper/propertysethelper.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/comphelper/inc/comphelper/propertysetinfo.hxx b/comphelper/inc/comphelper/propertysetinfo.hxx index 80a200a79b3a..268cd68b9f54 100644 --- a/comphelper/inc/comphelper/propertysetinfo.hxx +++ b/comphelper/inc/comphelper/propertysetinfo.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 @@ -82,7 +82,7 @@ public: /** adds an array of PropertyMapEntry to this instance <p>At most the number of entries given will be added, if no terminating entry (<code>mpName == <NULL/></code>) is encountered.</p> - + <p>If <arg>nCount</arg> is less than 0, it is ignored and all entries (up to, but not including, the terminating one) are added.</p> */ diff --git a/comphelper/inc/comphelper/propertystatecontainer.hxx b/comphelper/inc/comphelper/propertystatecontainer.hxx index 443c52fdf753..ddcd570f1e94 100644 --- a/comphelper/inc/comphelper/propertystatecontainer.hxx +++ b/comphelper/inc/comphelper/propertystatecontainer.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 @@ -46,8 +46,8 @@ namespace comphelper //===================================================================== //= OPropertyStateContainer //===================================================================== - typedef ::cppu::ImplHelper1 < ::com::sun::star::beans::XPropertyState - > OPropertyStateContainer_TBase; + typedef ::cppu::ImplHelper1 < ::com::sun::star::beans::XPropertyState + > OPropertyStateContainer_TBase; /** helper implementation for components which have properties with a default @@ -64,7 +64,7 @@ namespace comphelper @param _rBHelper help to be used for broadcasting events */ - OPropertyStateContainer( ::cppu::OBroadcastHelper& _rBHelper ); + OPropertyStateContainer( ::cppu::OBroadcastHelper& _rBHelper ); // ................................................................ // XPropertyState @@ -84,14 +84,14 @@ namespace comphelper <p>Already implemented by this base class, no need to override</p> @precond <arg>_nHandle</arg> is a valid property handle */ - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle( sal_Int32 _nHandle ); + virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle( sal_Int32 _nHandle ); /** set the property denoted by the given handle to it's default value <p>Already implemented by this base class, no need to override</p> @precond <arg>_nHandle</arg> is a valid property handle */ - virtual void setPropertyToDefaultByHandle( sal_Int32 _nHandle ); + virtual void setPropertyToDefaultByHandle( sal_Int32 _nHandle ); /** get the default value for the property denoted by the given handle @@ -108,14 +108,14 @@ namespace comphelper protected: /** returns the handle for the given name - + @throw UnknownPropertyException if the given name is not a registered property */ - sal_Int32 getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) ); + sal_Int32 getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) ); }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // COMPHELPER_PROPERTYSTATECONTAINER_HXX diff --git a/comphelper/inc/comphelper/propmultiplex.hxx b/comphelper/inc/comphelper/propmultiplex.hxx index 3c82dee247dd..6ff9c44f030a 100644 --- a/comphelper/inc/comphelper/propmultiplex.hxx +++ b/comphelper/inc/comphelper/propmultiplex.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 @@ -52,8 +52,8 @@ namespace comphelper { friend class OPropertyChangeMultiplexer; - OPropertyChangeMultiplexer* m_pAdapter; - ::osl::Mutex& m_rMutex; + OPropertyChangeMultiplexer* m_pAdapter; + ::osl::Mutex& m_rMutex; public: OPropertyChangeListener(::osl::Mutex& _rMutex) @@ -77,15 +77,15 @@ namespace comphelper //= OPropertyChangeMultiplexer //================================================================== /// multiplexer for property changes - class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer :public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> + class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer :public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> { friend class OPropertyChangeListener; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aProperties; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSet; - OPropertyChangeListener* m_pListener; - sal_Int32 m_nLockCount; - sal_Bool m_bListening : 1; - sal_Bool m_bAutoSetRelease : 1; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aProperties; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSet; + OPropertyChangeListener* m_pListener; + sal_Int32 m_nLockCount; + sal_Bool m_bListening : 1; + sal_Bool m_bAutoSetRelease : 1; virtual ~OPropertyChangeMultiplexer(); @@ -99,18 +99,18 @@ namespace comphelper virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException); /// incremental lock - void lock(); + void lock(); /// incremental unlock - void unlock(); + void unlock(); /// get the lock count - sal_Int32 locked() const { return m_nLockCount; } + sal_Int32 locked() const { return m_nLockCount; } void addProperty(const ::rtl::OUString& aPropertyName); void dispose(); }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_PROPERTY_MULTIPLEX_HXX_ diff --git a/comphelper/inc/comphelper/propstate.hxx b/comphelper/inc/comphelper/propstate.hxx index 2c8f06f4118a..ea917d2f1cc2 100644 --- a/comphelper/inc/comphelper/propstate.hxx +++ b/comphelper/inc/comphelper/propstate.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 @@ -75,9 +75,9 @@ namespace comphelper getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // access via handle - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); - virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; + virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); + virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); + virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; protected: virtual ~OPropertyStateHelper(); @@ -106,7 +106,7 @@ namespace comphelper }; //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_PROPERTY_STATE_HXX_ diff --git a/comphelper/inc/comphelper/proxyaggregation.hxx b/comphelper/inc/comphelper/proxyaggregation.hxx index 490569844a81..a5753dea064f 100644 --- a/comphelper/inc/comphelper/proxyaggregation.hxx +++ b/comphelper/inc/comphelper/proxyaggregation.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 @@ -51,7 +51,7 @@ | OComponentProxyAggregationHelper | - life time coupling: if the inner component (the "aggregate") +----------------------------------+ is disposed, the outer (the delegator) is disposed, too, and ^ vice versa - | - UNO based, implementing XEventListener + | - UNO based, implementing XEventListener | +----------------------------+ component aggregating another XComponent | OComponentProxyAggregation | - life time coupling as above @@ -64,7 +64,7 @@ => use OComponentProxyAggregation - call componentAggregateProxyFor in your ctor - call implEnsureDisposeInDtor in your dtor - + - wrap a foreign object which is a XComponent, but already have ref-counting mechanisms inherited from somewhere else => use OComponentProxyAggregationHelper @@ -89,9 +89,9 @@ namespace comphelper class OProxyAggregation { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxyAggregate; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xProxyTypeAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxyAggregate; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xProxyTypeAccess; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; protected: inline const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getORB() @@ -115,9 +115,9 @@ namespace comphelper ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); private: - OProxyAggregation( ); // never implemented - OProxyAggregation( const OProxyAggregation& ); // never implemented - OProxyAggregation& operator=( const OProxyAggregation& ); // never implemented + OProxyAggregation( ); // never implemented + OProxyAggregation( const OProxyAggregation& ); // never implemented + OProxyAggregation& operator=( const OProxyAggregation& ); // never implemented }; //========================================================================= @@ -132,18 +132,18 @@ namespace comphelper calls which your derived class gets to the dispose method of this class.</p> */ - class COMPHELPER_DLLPUBLIC OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 < com::sun::star::lang::XEventListener + class COMPHELPER_DLLPUBLIC OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 < com::sun::star::lang::XEventListener > ,private OProxyAggregation { private: - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XEventListener - > BASE; // prevents some MSVC problems + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XEventListener + > BASE; // prevents some MSVC problems protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xInner; - ::cppu::OBroadcastHelper& m_rBHelper; + ::cppu::OBroadcastHelper& m_rBHelper; protected: // OProxyAggregation @@ -176,17 +176,17 @@ namespace comphelper virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); private: - COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( ); // never implemented - COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ); // never implemented - COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ); // never implemented + COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( ); // never implemented + COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ); // never implemented + COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ); // never implemented }; //========================================================================= //= OComponentProxyAggregation //========================================================================= - typedef ::cppu::WeakComponentImplHelperBase OComponentProxyAggregation_CBase; + typedef ::cppu::WeakComponentImplHelperBase OComponentProxyAggregation_CBase; - class COMPHELPER_DLLPUBLIC OComponentProxyAggregation :public OBaseMutex + class COMPHELPER_DLLPUBLIC OComponentProxyAggregation :public OBaseMutex ,public OComponentProxyAggregation_CBase ,public OComponentProxyAggregationHelper { @@ -217,13 +217,13 @@ namespace comphelper void implEnsureDisposeInDtor( ); private: - COMPHELPER_DLLPRIVATE OComponentProxyAggregation( ); // never implemented - COMPHELPER_DLLPRIVATE OComponentProxyAggregation( const OComponentProxyAggregation& ); // never implemented - COMPHELPER_DLLPRIVATE OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ); // never implemented + COMPHELPER_DLLPRIVATE OComponentProxyAggregation( ); // never implemented + COMPHELPER_DLLPRIVATE OComponentProxyAggregation( const OComponentProxyAggregation& ); // never implemented + COMPHELPER_DLLPRIVATE OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ); // never implemented }; //............................................................................. -} // namespace comphelper +} // namespace comphelper //............................................................................. diff --git a/comphelper/inc/comphelper/querydeep.hxx b/comphelper/inc/comphelper/querydeep.hxx index af6d5ae6306f..716ed809a8a8 100644 --- a/comphelper/inc/comphelper/querydeep.hxx +++ b/comphelper/inc/comphelper/querydeep.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 @@ -41,9 +41,9 @@ namespace comphelper /** * Inspect interfaces types whether they are related by inheritance. *<BR> - * @return true if rType is derived from rBaseType - * @param rBaseType a <type>Type</type> of an interface. - * @param rType a <type>Type</type> of an interface. + * @return true if rType is derived from rBaseType + * @param rBaseType a <type>Type</type> of an interface. + * @param rType a <type>Type</type> of an interface. */ sal_Bool isDerivedFrom( const ::com::sun::star::uno::Type & rBaseType, @@ -53,9 +53,9 @@ sal_Bool isDerivedFrom( /** * Inspect interface types whether they are related by inheritance. *<BR> - * @return true if p is of a type derived from rBaseType - * @param rBaseType a <type>Type</type> of an interface. - * @param p a pointer to an interface. + * @return true if p is of a type derived from rBaseType + * @param rBaseType a <type>Type</type> of an interface. + * @param p a pointer to an interface. */ template <class Interface> inline sal_Bool isDerivedFrom( @@ -67,14 +67,14 @@ inline sal_Bool isDerivedFrom( //-------------------------------------------------------------------------------------------------------- // possible optimization ? -// Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); -// if (aRet.hasValue()) -// return aRet; +// Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); +// if (aRet.hasValue()) +// return aRet; /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. + * @param p1 a pointer to an interface. */ template< class Interface1 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -90,8 +90,8 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. */ template< class Interface1, class Interface2 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -109,9 +109,9 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -131,10 +131,10 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -156,11 +156,11 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -184,12 +184,12 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6 > @@ -217,13 +217,13 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7 > @@ -253,14 +253,14 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8 > @@ -292,15 +292,15 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. - * @param p9 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. + * @param p9 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9 > @@ -334,16 +334,16 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. - * @param p9 a pointer to an interface. - * @param p10 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. + * @param p9 a pointer to an interface. + * @param p10 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10 > @@ -379,17 +379,17 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. - * @param p9 a pointer to an interface. - * @param p10 a pointer to an interface. - * @param p11 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. + * @param p9 a pointer to an interface. + * @param p10 a pointer to an interface. + * @param p11 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10, @@ -429,18 +429,18 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. - * @param p9 a pointer to an interface. - * @param p10 a pointer to an interface. - * @param p11 a pointer to an interface. - * @param p12 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. + * @param p9 a pointer to an interface. + * @param p10 a pointer to an interface. + * @param p11 a pointer to an interface. + * @param p12 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10, diff --git a/comphelper/inc/comphelper/regpathhelper.hxx b/comphelper/inc/comphelper/regpathhelper.hxx index 27bbcb84287a..1e6061e18983 100644 --- a/comphelper/inc/comphelper/regpathhelper.hxx +++ b/comphelper/inc/comphelper/regpathhelper.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 comphelper * Search for the user registry using the following rules: * <dl> * <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry - * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section - * [Registry]. If found, then take this value instead of the name "user.rdb". + * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section + * [Registry]. If found, then take this value instead of the name "user.rdb". * <dt> 2. Search in the config directory of the user for a file "user.rdb". If - * found return the full path and name of the file. If not found, retry this - * step with a dot before ".user.rdb". + * found return the full path and name of the file. If not found, retry this + * step with a dot before ".user.rdb". * <dt> 3. If not found a new user registry with name "user.rdb" will be created in the user - * config directory. + * config directory. * </dl> *<BR> * @author Juergen Schmidt diff --git a/comphelper/inc/comphelper/scopeguard.hxx b/comphelper/inc/comphelper/scopeguard.hxx index 1c831c08ff20..5ae21d222ee5 100644 --- a/comphelper/inc/comphelper/scopeguard.hxx +++ b/comphelper/inc/comphelper/scopeguard.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,7 +45,7 @@ class COMPHELPER_DLLPUBLIC ScopeGuard : private ::boost::noncopyable { public: enum exc_handling { IGNORE_EXCEPTIONS, ALLOW_EXCEPTIONS }; - + /** @param func function object to be executed in dtor @param excHandling switches whether thrown exceptions in dtor will be silently ignored (but OSL_ asserted) @@ -54,14 +54,14 @@ public: explicit ScopeGuard( func_type const & func, exc_handling excHandling = IGNORE_EXCEPTIONS ) : m_func( func ), m_excHandling( excHandling ) {} - + ~ScopeGuard(); - + /** Dismisses the scope guard, i.e. the function won't be executed. */ void dismiss(); - + private: ::boost::function0<void> m_func; // preferring portable syntax exc_handling const m_excHandling; diff --git a/comphelper/inc/comphelper/seekableinput.hxx b/comphelper/inc/comphelper/seekableinput.hxx index 455ed7bb183c..7f412c385510 100644 --- a/comphelper/inc/comphelper/seekableinput.hxx +++ b/comphelper/inc/comphelper/seekableinput.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,10 +42,10 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OSeekableInputWrapper : public ::cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable > { - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; - + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xOriginalStream; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xCopyInput; @@ -79,7 +79,7 @@ public: }; -} // namespace comphelper +} // namespace comphelper #endif diff --git a/comphelper/inc/comphelper/seqstream.hxx b/comphelper/inc/comphelper/seqstream.hxx index 82c335616926..c51fe3483dd5 100644 --- a/comphelper/inc/comphelper/seqstream.hxx +++ b/comphelper/inc/comphelper/seqstream.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 @@ -52,9 +52,9 @@ namespace comphelper class COMPHELPER_DLLPUBLIC SequenceInputStream : public ::cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable > { - ::osl::Mutex m_aMutex; - ByteSequence m_aData; - sal_Int32 m_nPos; + ::osl::Mutex m_aMutex; + ByteSequence m_aData; + sal_Int32 m_nPos; public: SequenceInputStream(const ByteSequence& rData); @@ -90,18 +90,18 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XOutputStream > OSequence class OSequenceOutputStream : public OSequenceOutputStream_Base { protected: - ::com::sun::star::uno::Sequence< sal_Int8 >& m_rSequence; - double m_nResizeFactor; - sal_Int32 m_nMinimumResize; - sal_Int32 m_nMaximumResize; - sal_Int32 m_nSize; + ::com::sun::star::uno::Sequence< sal_Int8 >& m_rSequence; + double m_nResizeFactor; + sal_Int32 m_nMinimumResize; + sal_Int32 m_nMaximumResize; + sal_Int32 m_nSize; // the size of the virtual stream. This is not the size of the sequence, but the number of bytes written // into the stream at a given moment. - sal_Bool m_bConnected; + sal_Bool m_bConnected; // closeOutput has been called ? - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; protected: ~OSequenceOutputStream() { if (m_bConnected) closeOutput(); } @@ -109,18 +109,18 @@ protected: public: /** constructs the object. Everything written into the stream through the XOutputStream methods will be forwarded to the sequence, reallocating it if neccessary. Writing will start at offset 0 within the sequence. - @param _rSeq a reference to the sequence which will be used for output. + @param _rSeq a reference to the sequence which will be used for output. The caller is responsible for taking care of the lifetime of the stream object and the sequence. If you're in doubt about this, use <code>closeOutput</code> before destroying the sequence - @param _nResizeFactor the factor which is used for resizing the sequence when neccessary. In every + @param _nResizeFactor the factor which is used for resizing the sequence when neccessary. In every resize step, the new sequence size will be calculated by multiplying the current size with this factor, rounded off to the next multiple of 4. - @param _nMinimumResize the minmal number of bytes which is additionally allocated on resizing - @param _nMaximumResize as the growth of the stream size is exponential, you may want to specify a + @param _nMinimumResize the minmal number of bytes which is additionally allocated on resizing + @param _nMaximumResize as the growth of the stream size is exponential, you may want to specify a maxmimum amount of memory which the sequence will grow by. If -1 is used, no limit is applied - @see closeOutput + @see closeOutput */ OSequenceOutputStream( ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx index 17f2d7cab6bb..0d57913732e7 100644 --- a/comphelper/inc/comphelper/sequence.hxx +++ b/comphelper/inc/comphelper/sequence.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace comphelper { //......................................................................... - namespace staruno = ::com::sun::star::uno; + namespace staruno = ::com::sun::star::uno; //------------------------------------------------------------------------- /** search the given string within the given sequence, return the positions where it was found. @@ -135,7 +135,7 @@ namespace comphelper { public: virtual sal_Bool hasMoreElements() const = 0; - virtual ::com::sun::star::uno::Any nextElement() = 0; + virtual ::com::sun::star::uno::Any nextElement() = 0; }; /** a helper class for iterating through a sequence */ @@ -143,7 +143,7 @@ namespace comphelper class OSequenceIterator : public IIterator { const TYPE* m_pElements; - sal_Int32 m_nLen; + sal_Int32 m_nLen; const TYPE* m_pCurrent; public: @@ -155,7 +155,7 @@ namespace comphelper OSequenceIterator(const ::com::sun::star::uno::Any& _rSequenceAny); virtual sal_Bool hasMoreElements() const; - virtual ::com::sun::star::uno::Any nextElement(); + virtual ::com::sun::star::uno::Any nextElement(); protected: void construct(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq); @@ -234,7 +234,7 @@ namespace comphelper values will be truncated. There's currently no measure to prevent or detect precision loss, overflow or truncation. */ - template < typename DstType, typename SrcType > + template < typename DstType, typename SrcType > ::com::sun::star::uno::Sequence< DstType > arrayToSequence( const SrcType* i_pArray, sal_Int32 nNum ) { ::com::sun::star::uno::Sequence< DstType > result( nNum ); @@ -265,7 +265,7 @@ namespace comphelper will be truncated. There's currently no measure to prevent or detect precision loss, overflow or truncation. */ - template < typename DstType, typename SrcType > + template < typename DstType, typename SrcType > DstType* sequenceToArray( DstType* io_pArray, const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence ) { ::std::copy( i_Sequence.getConstArray(), i_Sequence.getConstArray()+i_Sequence.getLength(), io_pArray ); @@ -295,7 +295,7 @@ namespace comphelper truncated. There's currently no measure to prevent or detect precision loss, overflow or truncation. */ - template < typename DstType, typename SrcType > + template < typename DstType, typename SrcType > ::com::sun::star::uno::Sequence< DstType > containerToSequence( const SrcType& i_Container ) { ::com::sun::star::uno::Sequence< DstType > result( i_Container.size() ); @@ -335,7 +335,7 @@ namespace comphelper truncated. There's currently no measure to prevent or detect precision loss, overflow or truncation. */ - template < typename DstType, typename SrcType > + template < typename DstType, typename SrcType > DstType sequenceToContainer( const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence ) { DstType result( i_Sequence.getLength() ); @@ -373,7 +373,7 @@ namespace comphelper truncated. There's currently no measure to prevent or detect precision loss, overflow or truncation. */ - template < typename DstType, typename SrcType > + template < typename DstType, typename SrcType > DstType& sequenceToContainer( DstType& o_Output, const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence ) { o_Output.resize( i_Sequence.getLength() ); @@ -382,7 +382,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx index 0046f32bd100..8f2c6f79c03e 100644 --- a/comphelper/inc/comphelper/sequenceashashmap.hxx +++ b/comphelper/inc/comphelper/sequenceashashmap.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 @@ -100,7 +100,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase /** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&) */ SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lSource); - + //--------------------------------------- /** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&) */ @@ -195,7 +195,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @descr Its made const to prevent using of the return value directly as an in/out parameter! usage: myMethod(stlDequeAdapter.getAsAnyList()); - + @param bAsPropertyValue switch between using of PropertyValue or NamedValue as value type. @@ -204,7 +204,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase contains all items of this map. */ const ::com::sun::star::uno::Any getAsConstAny(::sal_Bool bAsPropertyValue) const; - + //--------------------------------------- /** @short return this map instance as a sequence< Any >, which can be @@ -217,12 +217,12 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param bAsPropertyValue switch between using of PropertyValue or NamedValue as value type. - + @return A const sequence which elements of Any, which contains all items of this map. */ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > getAsConstAnyList(::sal_Bool bAsPropertyValue) const; - + //--------------------------------------- /** @short return this map instance to as a NamedValue sequence, which can be @@ -335,12 +335,12 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param rCheck the map containing all items for checking. - @return + @return TRUE if all items of Rcheck could be found in these map; FALSE otherwise. */ sal_Bool match(const SequenceAsHashMap& rCheck) const; - + //--------------------------------------- /** @short merge all values from the given map into this one. @@ -353,7 +353,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase the map containing all items for the update. */ void update(const SequenceAsHashMap& rSource); - + //--------------------------------------- /** @short can be used to generate a file dump of the current content of this instance. diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx index 6fb303f0d36f..730c5e1998cd 100644 --- a/comphelper/inc/comphelper/sequenceasvector.hxx +++ b/comphelper/inc/comphelper/sequenceasvector.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 @@ -60,9 +60,9 @@ class SequenceAsVector : public ::std::vector< TElementType > { //------------------------------------------- // types - + public: - + //--------------------------------------- /** @short When inheriting from a template using typename is generally required when using types from the base! */ diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx index 77c56eafb417..75efeb17faf1 100644 --- a/comphelper/inc/comphelper/servicedecl.hxx +++ b/comphelper/inc/comphelper/servicedecl.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 @@ -66,7 +66,7 @@ typedef ::boost::function3< /** Class to declare a service implementation. There is no need to implement lang::XServiceInfo nor lang::XInitialization anymore. The declaration can be done in various ways, the (simplest) form is - + <pre> class MyClass : cppu::WeakImplHelper2<XInterface1, XInterface2> { public: @@ -80,11 +80,11 @@ typedef ::boost::function3< "my.unique.implementation.name", "MyServiceSpec1;MyServiceSpec2" ); </pre> - + If the service demands initialization by arguments, the implementation class has to define a constructor taking both arguments and component context: - + <pre> class MyClass : cppu::WeakImplHelper2<XInterface1, XInterface2> { public: @@ -103,7 +103,7 @@ typedef ::boost::function3< Additionally, there is the possibility to process some code after creation, e.g. to add the newly created object as a listener or perform aggregation (C++-UNO only): - + <pre> uno::Reference<uno::XInterface> somePostProcCode( MyClass * p ); [...] @@ -120,7 +120,7 @@ class COMPHELPER_DLLPUBLIC ServiceDecl : private ::boost::noncopyable { public: /** Ctor for multiple supported service names. - + @param implClass implementation class description @param pImplName implementation name @param pSupportedServiceNames supported service names @@ -134,26 +134,26 @@ public: m_pImplName(pImplName), m_pServiceNames(pSupportedServiceNames), m_cDelim(cDelim) {} - + /// @internal gets called by component_writeInfoHelper() bool writeInfo( ::com::sun::star::registry::XRegistryKey * xKey ) const; /// @internal gets called by component_getFactoryHelper() void * getFactory( sal_Char const* pImplName ) const; - + /// @return supported service names ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames() const; - + /// @return whether name is in set of supported service names bool supportsService( ::rtl::OUString const& name ) const; - + /// @return implementation name ::rtl::OUString getImplementationName() const; - + private: class Factory; friend class Factory; - + detail::CreateFuncF const m_createFunc; char const* const m_pImplName; char const* const m_pServiceNames; @@ -173,8 +173,8 @@ class OwnServiceImpl private ::boost::noncopyable { typedef ImplT BaseT; - -public: + +public: OwnServiceImpl( ServiceDecl const& rServiceDecl, css::uno::Sequence<css::uno::Any> const& args, @@ -184,7 +184,7 @@ public: ServiceDecl const& rServiceDecl, css::uno::Reference<css::uno::XComponentContext> const& xContext ) : BaseT(xContext), m_rServiceDecl(rServiceDecl) {} - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { @@ -198,7 +198,7 @@ public: SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return m_rServiceDecl.getSupportedServiceNames(); } - + private: ServiceDecl const& m_rServiceDecl; }; @@ -235,7 +235,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<false> > { PostProcessFuncT const m_postProcessFunc; explicit CreateFunc( PostProcessFuncT const& postProcessFunc ) : m_postProcessFunc(postProcessFunc) {} - + css::uno::Reference<css::uno::XInterface> operator()( ServiceDecl const& rServiceDecl, css::uno::Sequence<css::uno::Any> const&, @@ -252,7 +252,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > { PostProcessFuncT const m_postProcessFunc; explicit CreateFunc( PostProcessFuncT const& postProcessFunc ) : m_postProcessFunc(postProcessFunc) {} - + css::uno::Reference<css::uno::XInterface> operator()( ServiceDecl const& rServiceDecl, css::uno::Sequence<css::uno::Any> const& args, @@ -267,7 +267,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > { } // namespace detail /** Defines a service implementation class. - + @tpl ImplT_ service implementation class @WithArgsT whether the implementation class ctor expects arguments (uno::Sequence<uno::Any>, uno::Reference<uno::XComponentContext>) @@ -276,9 +276,9 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > { template <typename ImplT_, typename WithArgsT = with_args<false> > struct serviceimpl_base { typedef ImplT_ ImplT; - + detail::CreateFuncF const m_createFunc; - + typedef detail::PostProcessDefault<ImplT> PostProcessDefaultT; /** Default ctor. Implementation class without args, expecting @@ -289,7 +289,7 @@ struct serviceimpl_base { PostProcessDefaultT() ) ) {} /** Ctor to pass a post processing function/functor. - + @tpl PostProcessDefaultT let your compiler deduce this @param postProcessFunc function/functor that gets the yet unacquired ImplT_ pointer returning a @@ -311,7 +311,7 @@ struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT class_() : baseT() {} template <typename PostProcessFuncT> /** Ctor to pass a post processing function/functor. - + @tpl PostProcessDefaultT let your compiler deduce this @param postProcessFunc function/functor that gets the yet unacquired ImplT_ pointer returning a @@ -332,22 +332,22 @@ struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT pRet = BOOST_PP_CAT(s, n_).getFactory(pImplName); /** The following preprocessor repetitions generate functions like - + <pre> inline sal_Bool component_writeInfoHelper( ::com::sun::star::lang::XMultiServiceFactory *, ::com::sun::star::registry::XRegistryKey * xRegistryKey, ServiceDecl const& s0, ServiceDecl const& s1, ... ); - + inline void * component_getFactoryHelper( sal_Char const* pImplName, ::com::sun::star::lang::XMultiServiceFactory *, ::com::sun::star::registry::XRegistryKey * xRegistryKey, ServiceDecl const& s0, ServiceDecl const& s1, ... ); </pre> - + which call on the passed service declarations. - + The maximum number of service declarations can be set by defining COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS; its default is 8. */ @@ -390,15 +390,15 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS, /** The following preprocessor macro generates the C access functions, that are used to initialize and register the components of a shared library object. - + If you have, say, written a lib that contains three distinct components, each with its own ServiceDecl object, you might want to employ the following code: <pre> // must reside outside _any_ namespace - COMPHELPER_SERVICEDECL_EXPORTS3(yourServiceDecl1, - yourServiceDecl2, + COMPHELPER_SERVICEDECL_EXPORTS3(yourServiceDecl1, + yourServiceDecl2, yourServiceDecl3); </pre> diff --git a/comphelper/inc/comphelper/servicehelper.hxx b/comphelper/inc/comphelper/servicehelper.hxx index e691ea2bd76c..f5784b617231 100644 --- a/comphelper/inc/comphelper/servicehelper.hxx +++ b/comphelper/inc/comphelper/servicehelper.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/comphelper/inc/comphelper/serviceinfohelper.hxx b/comphelper/inc/comphelper/serviceinfohelper.hxx index 859f35cc707f..f71297dafc65 100644 --- a/comphelper/inc/comphelper/serviceinfohelper.hxx +++ b/comphelper/inc/comphelper/serviceinfohelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/inc/comphelper/sharedmutex.hxx b/comphelper/inc/comphelper/sharedmutex.hxx index a1984121fc50..b26b438e83d8 100644 --- a/comphelper/inc/comphelper/sharedmutex.hxx +++ b/comphelper/inc/comphelper/sharedmutex.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx index 5ad07f201f1a..30295f68be53 100644 --- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx +++ b/comphelper/inc/comphelper/stillreadwriteinteraction.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/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx index 89f0e023f0c1..36eb57a7ad04 100644 --- a/comphelper/inc/comphelper/stl_types.hxx +++ b/comphelper/inc/comphelper/stl_types.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 @@ -158,9 +158,9 @@ public: */ template < class IAFCE > struct OInterfaceCompare - :public ::std::binary_function < ::com::sun::star::uno::Reference< IAFCE > - , ::com::sun::star::uno::Reference< IAFCE > - , bool + :public ::std::binary_function < ::com::sun::star::uno::Reference< IAFCE > + , ::com::sun::star::uno::Reference< IAFCE > + , bool > { bool operator() (const ::com::sun::star::uno::Reference< IAFCE >& lhs, const ::com::sun::star::uno::Reference< IAFCE >& rhs) const @@ -174,7 +174,7 @@ struct OInterfaceCompare }; template <class _Tp, class _Arg> -class mem_fun1_t : public ::std::binary_function<_Tp*,_Arg,void> +class mem_fun1_t : public ::std::binary_function<_Tp*,_Arg,void> { typedef void (_Tp::*_fun_type)(_Arg); public: @@ -186,8 +186,8 @@ private: template <class _Tp, class _Arg> inline mem_fun1_t<_Tp,_Arg> mem_fun(void (_Tp::*__f)(_Arg)) -{ - return mem_fun1_t<_Tp,_Arg>(__f); +{ + return mem_fun1_t<_Tp,_Arg>(__f); } //......................................................................... diff --git a/comphelper/inc/comphelper/stlunosequence.hxx b/comphelper/inc/comphelper/stlunosequence.hxx index 454de6400c32..8cba0640af94 100644 --- a/comphelper/inc/comphelper/stlunosequence.hxx +++ b/comphelper/inc/comphelper/stlunosequence.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx index b8efa00b0d92..8b3fc638e0f8 100644 --- a/comphelper/inc/comphelper/storagehelper.hxx +++ b/comphelper/inc/comphelper/storagehelper.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,9 +40,9 @@ #include "comphelper/comphelperdllapi.h" -#define PACKAGE_STORAGE_FORMAT_STRING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageFormat" ) ) -#define ZIP_STORAGE_FORMAT_STRING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZipFormat" ) ) -#define OFOPXML_STORAGE_FORMAT_STRING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OFOPXMLFormat" ) ) +#define PACKAGE_STORAGE_FORMAT_STRING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageFormat" ) ) +#define ZIP_STORAGE_FORMAT_STRING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZipFormat" ) ) +#define OFOPXML_STORAGE_FORMAT_STRING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OFOPXMLFormat" ) ) namespace comphelper { diff --git a/comphelper/inc/comphelper/streamsection.hxx b/comphelper/inc/comphelper/streamsection.hxx index fb1758135e9e..e59c2442a8c2 100644 --- a/comphelper/inc/comphelper/streamsection.hxx +++ b/comphelper/inc/comphelper/streamsection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,37 +37,37 @@ namespace comphelper { - namespace stario = ::com::sun::star::io; - namespace staruno = ::com::sun::star::uno; + namespace stario = ::com::sun::star::io; + namespace staruno = ::com::sun::star::uno; /** implements handling for compatibly reading/writing data from/into an input/output stream. data written in a block secured by this class should be readable by older versions which use the same mechanism. - @author Frank Schoenheit - @since 00/26/05 + @author Frank Schoenheit + @since 00/26/05 */ class COMPHELPER_DLLPUBLIC OStreamSection { - staruno::Reference< stario::XMarkableStream > m_xMarkStream; - staruno::Reference< stario::XDataInputStream > m_xInStream; - staruno::Reference< stario::XDataOutputStream > m_xOutStream; + staruno::Reference< stario::XMarkableStream > m_xMarkStream; + staruno::Reference< stario::XDataInputStream > m_xInStream; + staruno::Reference< stario::XDataOutputStream > m_xOutStream; - sal_Int32 m_nBlockStart; - sal_Int32 m_nBlockLen; + sal_Int32 m_nBlockStart; + sal_Int32 m_nBlockLen; public: - /** starts reading of a "skippable" section of data within the given input stream<BR> - @param _rxInput the stream to read from. Must support the + /** starts reading of a "skippable" section of data within the given input stream<BR> + @param _rxInput the stream to read from. Must support the <type scope="com::sun::star::io">XMarkableStream</type> interface */ OStreamSection(const staruno::Reference< stario::XDataInputStream >& _rxInput); - /** starts writing of a "skippable" section of data into the given output stream - @param _rxOutput the stream the stream to write to. Must support the + /** starts writing of a "skippable" section of data into the given output stream + @param _rxOutput the stream the stream to write to. Must support the <type scope="com::sun::star::io">XMarkableStream</type> interface - @param _nPresumedLength estimation for the length of the upcoming section. If greater 0, this + @param _nPresumedLength estimation for the length of the upcoming section. If greater 0, this value will be written as section length and corrected (in the dtor) only if needed. If you know how much bytes you are about to write, you may want to use this param, saving some stream operations this way. @@ -84,7 +84,7 @@ public: sal_Int32 available(); }; -} // namespace comphelper +} // namespace comphelper #endif // _COMPHELPER_STREAMSECTION_HXX_ diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx index 2ffbdba09735..5101465bd29f 100644 --- a/comphelper/inc/comphelper/string.hxx +++ b/comphelper/inc/comphelper/string.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/comphelper/inc/comphelper/synchronousdispatch.hxx b/comphelper/inc/comphelper/synchronousdispatch.hxx index 4bd0375086b6..7dca46d6d4c0 100644 --- a/comphelper/inc/comphelper/synchronousdispatch.hxx +++ b/comphelper/inc/comphelper/synchronousdispatch.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 @@ -54,7 +54,7 @@ namespace comphelper //= SynchronousDispatch //==================================================================== /** a helper class for working with the dispatch interface replacing - loadComponentFromURL + loadComponentFromURL */ class SynchronousDispatch { diff --git a/comphelper/inc/comphelper/types.hxx b/comphelper/inc/comphelper/types.hxx index 46020e64dd29..ba39c328895b 100644 --- a/comphelper/inc/comphelper/types.hxx +++ b/comphelper/inc/comphelper/types.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 @@ -48,12 +48,12 @@ namespace comphelper { //......................................................................... - namespace staruno = ::com::sun::star::uno; - namespace starawt = ::com::sun::star::awt; - namespace starlang = ::com::sun::star::lang; + namespace staruno = ::com::sun::star::uno; + namespace starawt = ::com::sun::star::awt; + namespace starlang = ::com::sun::star::lang; - typedef staruno::Reference< staruno::XInterface > InterfaceRef; - typedef staruno::Sequence< ::rtl::OUString > StringSequence; + typedef staruno::Reference< staruno::XInterface > InterfaceRef; + typedef staruno::Sequence< ::rtl::OUString > StringSequence; //------------------------------------------------------------------------- /** compare the two given Anys @@ -65,8 +65,8 @@ namespace comphelper //------------------------------------------------------------------------- /** compare two FontDescriptor's */ - COMPHELPER_DLLPUBLIC sal_Bool operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight); - inline sal_Bool operator !=(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight) + COMPHELPER_DLLPUBLIC sal_Bool operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight); + inline sal_Bool operator !=(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight) { return !(_rLeft == _rRight); } @@ -138,11 +138,11 @@ namespace comphelper //------------------------------------------------------------------------- - /** get a com::sun::star::awt::FontDescriptor that is fully initialized with + /** get a com::sun::star::awt::FontDescriptor that is fully initialized with the XXX_DONTKNOW enum values (which isn't the case if you instantiate it via the default constructor) */ - COMPHELPER_DLLPUBLIC starawt::FontDescriptor getDefaultFont(); + COMPHELPER_DLLPUBLIC starawt::FontDescriptor getDefaultFont(); /** examine a sequence for the <type scope="com.sun.star.uno">Type</type> of it's elements. */ @@ -156,14 +156,14 @@ namespace comphelper // no, we don't use templates here. This would lead to a lot of implicit uses of the conversion methods, // which would be difficult to trace ... - COMPHELPER_DLLPUBLIC sal_Int32 getINT32(const staruno::Any& _rAny); - COMPHELPER_DLLPUBLIC sal_Int16 getINT16(const staruno::Any& _rAny); - COMPHELPER_DLLPUBLIC double getDouble(const staruno::Any& _rAny); - COMPHELPER_DLLPUBLIC float getFloat(const staruno::Any& _rAny); - COMPHELPER_DLLPUBLIC ::rtl::OUString getString(const staruno::Any& _rAny); - COMPHELPER_DLLPUBLIC sal_Bool getBOOL(const staruno::Any& _rAny); + COMPHELPER_DLLPUBLIC sal_Int32 getINT32(const staruno::Any& _rAny); + COMPHELPER_DLLPUBLIC sal_Int16 getINT16(const staruno::Any& _rAny); + COMPHELPER_DLLPUBLIC double getDouble(const staruno::Any& _rAny); + COMPHELPER_DLLPUBLIC float getFloat(const staruno::Any& _rAny); + COMPHELPER_DLLPUBLIC ::rtl::OUString getString(const staruno::Any& _rAny); + COMPHELPER_DLLPUBLIC sal_Bool getBOOL(const staruno::Any& _rAny); - COMPHELPER_DLLPUBLIC sal_Int32 getEnumAsINT32(const staruno::Any& _rAny) throw(starlang::IllegalArgumentException); + COMPHELPER_DLLPUBLIC sal_Int32 getEnumAsINT32(const staruno::Any& _rAny) throw(starlang::IllegalArgumentException); //= replacement of some former UsrAny.setXXX methods - can be used with rvalues inline void setBOOL(staruno::Any& _rAny, sal_Bool _b) @@ -174,7 +174,7 @@ namespace comphelper { return staruno::Any(&_b, ::getBooleanCppuType()); } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_TYPES_HXX_ diff --git a/comphelper/inc/comphelper/uieventslogger.hxx b/comphelper/inc/comphelper/uieventslogger.hxx index 40e9a68ad1cf..6812a0f3f7b5 100644 --- a/comphelper/inc/comphelper/uieventslogger.hxx +++ b/comphelper/inc/comphelper/uieventslogger.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/inc/comphelper/uno3.hxx b/comphelper/inc/comphelper/uno3.hxx index 617c200d3fd5..8cd7e90c8b57 100644 --- a/comphelper/inc/comphelper/uno3.hxx +++ b/comphelper/inc/comphelper/uno3.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 @@ -51,19 +51,19 @@ namespace comphelper /** used for declaring UNO3-Defaults, i.e. acquire/release */ #define DECLARE_UNO3_DEFAULTS(classname, baseclass) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() + virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ + virtual void SAL_CALL release() throw() { baseclass::release(); } \ + void SAL_CALL PUT_SEMICOLON_AT_THE_END() /** used for declaring UNO3-Defaults, i.e. acquire/release if you want to forward all queryInterfaces to the base class, (e.g. if you overload queryAggregation) */ #define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ + virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ + virtual void SAL_CALL release() throw() { baseclass::release(); } \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ { return baseclass::queryInterface(_rType); } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() + void SAL_CALL PUT_SEMICOLON_AT_THE_END() /** Use this macro to forward XComponent methods to base class @@ -88,23 +88,23 @@ namespace comphelper that would be ::cppu::WeakComponentImplHelperBase */ #define DECLARE_UNO3_XCOMPONENT_DEFAULTS(classname, baseclass, implhelper) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ + virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ + virtual void SAL_CALL release() throw() { baseclass::release(); } \ virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::dispose(); \ - } \ - virtual void SAL_CALL addEventListener( \ + { \ + implhelper::dispose(); \ + } \ + virtual void SAL_CALL addEventListener( \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::addEventListener(xListener); \ - } \ - virtual void SAL_CALL removeEventListener( \ + { \ + implhelper::addEventListener(xListener); \ + } \ + virtual void SAL_CALL removeEventListener( \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::removeEventListener(xListener); \ - } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() + { \ + implhelper::removeEventListener(xListener); \ + } \ + void SAL_CALL PUT_SEMICOLON_AT_THE_END() /** Use this macro to forward XComponent methods to base class @@ -130,25 +130,25 @@ namespace comphelper that would be ::cppu::WeakComponentImplHelperBase */ #define DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS(classname, baseclass, implhelper) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ - { return baseclass::queryInterface(_rType); } \ + virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ + virtual void SAL_CALL release() throw() { baseclass::release(); } \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ + { return baseclass::queryInterface(_rType); } \ virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::dispose(); \ - } \ - virtual void SAL_CALL addEventListener( \ + { \ + implhelper::dispose(); \ + } \ + virtual void SAL_CALL addEventListener( \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::addEventListener(xListener); \ - } \ - virtual void SAL_CALL removeEventListener( \ + { \ + implhelper::addEventListener(xListener); \ + } \ + virtual void SAL_CALL removeEventListener( \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::removeEventListener(xListener); \ - } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() + { \ + implhelper::removeEventListener(xListener); \ + } \ + void SAL_CALL PUT_SEMICOLON_AT_THE_END() //===================================================================== @@ -156,7 +156,7 @@ namespace comphelper //===================================================================== //= forwarding/merging XInterface funtionality //===================================================================== - #define DECLARE_XINTERFACE( ) \ + #define DECLARE_XINTERFACE( ) \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); \ virtual void SAL_CALL acquire() throw(); \ virtual void SAL_CALL release() throw(); @@ -192,7 +192,7 @@ namespace comphelper //===================================================================== //= forwarding/merging XTypeProvider funtionality //===================================================================== - #define DECLARE_XTYPEPROVIDER( ) \ + #define DECLARE_XTYPEPROVIDER( ) \ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); \ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); @@ -211,7 +211,7 @@ namespace comphelper } \ return pId->getImplementationId(); \ } - + #define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes( ) throw (::com::sun::star::uno::RuntimeException) \ { \ @@ -281,7 +281,7 @@ namespace comphelper } #define FORWARD_DECLARE_INTERFACE(NAME,XFACE) \ namespace com \ - { \ + { \ namespace sun \ {\ namespace star \ @@ -296,7 +296,7 @@ namespace comphelper //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif // _COMPHELPER_UNO3_HXX_ diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx index 94dfb2263f2d..d0a9ba8abb0f 100644 --- a/comphelper/inc/comphelper/unwrapargs.hxx +++ b/comphelper/inc/comphelper/unwrapargs.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 @@ -99,7 +99,7 @@ inline void extract( BOOST_PP_CAT(T, n_) & BOOST_PP_CAT(v, n_) /** The following preprocessor repetitions generate functions like - + <pre> template <typename T0, typename T1, ...> inline void unwrapArgs( @@ -110,7 +110,7 @@ inline void extract( </pre> (full namespace qualification ::com::sun::star has been omitted for brevity) - + which unwraps the passed sequence's elements, assigning them to the referenced values. Specify optional arguments as boost::optional<T>. If the length of the sequence is greater than the count of arguments, @@ -118,8 +118,8 @@ inline void extract( If too few arguments are given in the sequence and a missing argument is no boost::optional<T>, then an lang::IllegalArgumentException is thrown with the specified xErrorContext (defaults to null-ref). - - The maximum number of service declarations can be set by defining + + The maximum number of service declarations can be set by defining COMPHELPER_UNWRAPARGS_MAX_ARGS; its default is 12. */ #define COMPHELPER_UNWRAPARGS_make(z_, n_, unused_) \ diff --git a/comphelper/inc/comphelper/weak.hxx b/comphelper/inc/comphelper/weak.hxx index 5f3f8b14432a..4cda2f7370a5 100644 --- a/comphelper/inc/comphelper/weak.hxx +++ b/comphelper/inc/comphelper/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 @@ -34,7 +34,7 @@ #include <cppuhelper/weak.hxx> namespace comphelper -{ +{ /** Base class to implement an UNO object supporting types and weak references, i.e. the object can be held weakly (by a ::com::sun::star::uno::WeakReference). This implementation copes with reference counting. Upon last release(), the virtual dtor @@ -49,9 +49,9 @@ public: OWeakTypeObject(); virtual ~OWeakTypeObject(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL release() throw (); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/comphelper/inc/comphelper/weakbag.hxx b/comphelper/inc/comphelper/weakbag.hxx index b1c443338e06..e24ebda06c8c 100644 --- a/comphelper/inc/comphelper/weakbag.hxx +++ b/comphelper/inc/comphelper/weakbag.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/comphelper/inc/comphelper/weakeventlistener.hxx b/comphelper/inc/comphelper/weakeventlistener.hxx index c4cc42bc4052..80705b374096 100644 --- a/comphelper/inc/comphelper/weakeventlistener.hxx +++ b/comphelper/inc/comphelper/weakeventlistener.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 @@ -83,13 +83,13 @@ namespace comphelper const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >& _rxListener, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxBroadcaster ) - :m_aListener ( _rxListener ) - ,m_xBroadcaster ( _rxBroadcaster ) + :m_aListener ( _rxListener ) + ,m_xBroadcaster ( _rxBroadcaster ) { } protected: - virtual ~OWeakListenerAdapterBase(); + virtual ~OWeakListenerAdapterBase(); }; @@ -120,9 +120,9 @@ namespace comphelper ); protected: - inline ::com::sun::star::uno::Reference< LISTENER > getListener( ) const + inline ::com::sun::star::uno::Reference< LISTENER > getListener( ) const { - return ::com::sun::star::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), ::com::sun::star::uno::UNO_QUERY ); + return ::com::sun::star::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), ::com::sun::star::uno::UNO_QUERY ); } // XEventListener overridables @@ -137,10 +137,10 @@ namespace comphelper //===================================================================== //= OWeakEventListenerAdapter //===================================================================== - typedef OWeakListenerAdapter < ::com::sun::star::lang::XComponent - , ::com::sun::star::lang::XEventListener - > OWeakEventListenerAdapter_Base; - /** the most simple listener adapter: for XEventListeners at XComponents + typedef OWeakListenerAdapter < ::com::sun::star::lang::XComponent + , ::com::sun::star::lang::XEventListener + > OWeakEventListenerAdapter_Base; + /** the most simple listener adapter: for XEventListeners at XComponents */ class COMPHELPER_DLLPUBLIC OWeakEventListenerAdapter : public OWeakEventListenerAdapter_Base { @@ -182,7 +182,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif// COMPHELPER_WEAKEVENTLISTENER_HXX diff --git a/comphelper/inc/pch/precompiled_comphelper.cxx b/comphelper/inc/pch/precompiled_comphelper.cxx index ad6e1ab9b5ac..a9d2cf08d8a7 100644 --- a/comphelper/inc/pch/precompiled_comphelper.cxx +++ b/comphelper/inc/pch/precompiled_comphelper.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/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx index 7fcb7d048fe2..de062d4a6441 100644 --- a/comphelper/inc/pch/precompiled_comphelper.hxx +++ b/comphelper/inc/pch/precompiled_comphelper.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/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java index deeffe6baf32..751c4a90317b 100644 --- a/comphelper/qa/complex/comphelper/Map.java +++ b/comphelper/qa/complex/comphelper/Map.java @@ -1,23 +1,23 @@ /* * * 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 - * + * * This file is part of OpenOffice.org. - * + * * OpenOffice.org is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 3 * only, as published by the Free Software Foundation. - * + * * OpenOffice.org is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License version 3 for more details * (a copy is included in the LICENSE file that accompanied this code). - * + * * You should have received a copy of the GNU Lesser General Public License * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> @@ -292,7 +292,7 @@ public class Map extends complexlib.ComplexTestCase public Type getElementType() { throw new UnsupportedOperationException( "Not implemented." ); } public boolean hasElements() { throw new UnsupportedOperationException( "Not implemented." ); } }; - + private class DummyContainer implements XContainer { public void addContainerListener( XContainerListener arg0 ) { throw new UnsupportedOperationException( "Not implemented." ); } diff --git a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java index 26879a7c83ad..de95d209b4b8 100644 --- a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java +++ b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.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 @@ -34,16 +34,16 @@ import com.sun.star.lang.XMultiServiceFactory; public class SequenceOutputStreamUnitTest extends ComplexTestCase { private XMultiServiceFactory m_xMSF = null; - + public String[] getTestMethodNames() { return new String[] { "ExecuteTest01"}; } - + public String getTestObjectName () { return "SequenceOutputStreamUnitTest"; } - + public static String getShortTestDescription() { return "tests the SequenceOutput/InputStream implementations"; } @@ -58,11 +58,11 @@ public class SequenceOutputStreamUnitTest extends ComplexTestCase { failed ("Cannot create service factory!"); } } - + public void after() { m_xMSF = null; } - + public void ExecuteTest01() { Test01 aTest = new Test01 (m_xMSF, log); assure ( "Test01 failed!", aTest.test() ); diff --git a/comphelper/qa/complex/comphelper/Test01.java b/comphelper/qa/complex/comphelper/Test01.java index 6900b738aeba..14738844eafa 100644 --- a/comphelper/qa/complex/comphelper/Test01.java +++ b/comphelper/qa/complex/comphelper/Test01.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 @@ -37,26 +37,26 @@ import share.LogWriter; public class Test01 { XMultiServiceFactory m_xMSF = null; TestHelper m_aTestHelper = null; - + public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) { m_xMSF = xMSF; m_aTestHelper = new TestHelper (aLogWriter, "Test01: "); } - + public boolean test () { try { final int nBytesCnt = 20; - + //create SequenceOutputStream - Object oSequenceOutputStream = m_xMSF.createInstance ( + Object oSequenceOutputStream = m_xMSF.createInstance ( "com.sun.star.io.SequenceOutputStream" ); - XSequenceOutputStream xSeqOutStream = - (XSequenceOutputStream) UnoRuntime.queryInterface ( + XSequenceOutputStream xSeqOutStream = + (XSequenceOutputStream) UnoRuntime.queryInterface ( XSequenceOutputStream.class, oSequenceOutputStream ); m_aTestHelper.Message ( "SequenceOutputStream created." ); - + //write something to the stream byte pBytesOriginal[] = new byte [nBytesCnt]; Random oRandom = new Random(); @@ -64,27 +64,27 @@ public class Test01 { xSeqOutStream.writeBytes (pBytesOriginal); byte pBytesWritten[] = xSeqOutStream.getWrittenBytes (); m_aTestHelper.Message ( "SeuenceOutputStream filled." ); - + //create SequenceInputstream Object pArgs[] = new Object[1]; pArgs[0] = pBytesWritten; Object oSequenceInputStream = m_xMSF.createInstanceWithArguments ( "com.sun.star.io.SequenceInputStream", pArgs ); - XSeekableInputStream xSeekableInStream = - (XSeekableInputStream)UnoRuntime.queryInterface ( + XSeekableInputStream xSeekableInStream = + (XSeekableInputStream)UnoRuntime.queryInterface ( XSeekableInputStream.class, oSequenceInputStream ); m_aTestHelper.Message ( "SequenceInputStream created." ); - + //read from the stream byte pBytesRead[][] = new byte [1][nBytesCnt]; xSeekableInStream.readBytes ( pBytesRead, pBytesRead[0].length + 1 ); m_aTestHelper.Message ( "Read from SequenceInputStream." ); - + //close the streams xSeqOutStream.closeOutput (); xSeekableInStream.closeInput (); m_aTestHelper.Message ( "Both streams closed." ); - + //compare the original, written and read arrys for ( int i = 0; i < nBytesCnt; ++i ) { if ( pBytesOriginal[i] != pBytesWritten[i] ) { diff --git a/comphelper/qa/complex/comphelper/TestHelper.java b/comphelper/qa/complex/comphelper/TestHelper.java index 0a6989e95271..8a685e9ca4f2 100644 --- a/comphelper/qa/complex/comphelper/TestHelper.java +++ b/comphelper/qa/complex/comphelper/TestHelper.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 @@ -31,17 +31,17 @@ import share.LogWriter; public class TestHelper { LogWriter m_aLogWriter; String m_sTestPrefix; - + /** Creates a new instance of TestHelper */ public TestHelper ( LogWriter aLogWriter, String sTestPrefix ) { m_aLogWriter = aLogWriter; m_sTestPrefix = sTestPrefix; } - + public void Error ( String sError ) { m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError ); } - + public void Message ( String sMessage ) { m_aLogWriter.println ( m_sTestPrefix + sMessage ); } diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx index 9e355a5c9528..7b997e6d1396 100644 --- a/comphelper/qa/test_string.cxx +++ b/comphelper/qa/test_string.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/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx index 9c60f11dd925..acb6e567a37c 100644 --- a/comphelper/qa/test_weakbag.cxx +++ b/comphelper/qa/test_weakbag.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/comphelper/qa/version.map b/comphelper/qa/version.map index 7321bbca16ad..f313c44bd7ad 100644 --- a/comphelper/qa/version.map +++ b/comphelper/qa/version.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index 04152c8156cf..e1e77e7b26dc 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.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 @@ -80,9 +80,9 @@ public: class AnyCompareFactory : public cppu::WeakImplHelper3< XAnyCompareFactory, XInitialization, XServiceInfo > { - Reference< XAnyCompare > m_rAnyCompare; + Reference< XAnyCompare > m_rAnyCompare; Reference< XComponentContext > m_rContext; - Locale m_Locale; + Locale m_Locale; public: AnyCompareFactory( Reference< XComponentContext > xContext ) : m_rContext( xContext ) diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index d5a7129911b0..9cf477ce39b3 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.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/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 329e6211c6ea..4a89d2257f42 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.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/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx index ef99066c4bf5..396783c4027b 100644 --- a/comphelper/source/container/container.cxx +++ b/comphelper/source/container/container.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 @@ -75,7 +75,7 @@ IndexAccessIterator::~IndexAccessIterator() {} // zuerst absteigen, wenn moeglich ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> xContainerAccess(xSearchLoop, ::com::sun::star::uno::UNO_QUERY); if (xContainerAccess.is() && xContainerAccess->getCount() && ShouldStepInto(xContainerAccess)) - { // zum ersten Child + { // zum ersten Child ::com::sun::star::uno::Any aElement(xContainerAccess->getByIndex(0)); xSearchLoop = *(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*)aElement.getValue(); bCheckingStartingPoint = sal_False; @@ -86,7 +86,7 @@ IndexAccessIterator::~IndexAccessIterator() {} { // dann nach oben und nach rechts, wenn moeglich while (m_arrChildIndizies.size() > 0) - { // (mein Stack ist nich leer, also kann ich noch nach oben gehen) + { // (mein Stack ist nich leer, also kann ich noch nach oben gehen) ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> xChild(xSearchLoop, ::com::sun::star::uno::UNO_QUERY); OSL_ENSURE(xChild.is(), "IndexAccessIterator::Next : a content has no approriate interface !"); @@ -99,7 +99,7 @@ IndexAccessIterator::~IndexAccessIterator() {} m_arrChildIndizies.pop_back(); if (nOldSearchChildIndex < xContainerAccess->getCount() - 1) - { // auf dieser Ebene geht es noch nach rechts + { // auf dieser Ebene geht es noch nach rechts ++nOldSearchChildIndex; // also das naechste Child ::com::sun::star::uno::Any aElement(xContainerAccess->getByIndex(nOldSearchChildIndex)); @@ -116,14 +116,14 @@ IndexAccessIterator::~IndexAccessIterator() {} } if ((m_arrChildIndizies.size() == 0) && !bCheckingStartingPoint) - { // das ist genau dann der Fall, wenn ich keinen rechten Nachbarn fuer irgendeinen der direkten Vorfahren des + { // das ist genau dann der Fall, wenn ich keinen rechten Nachbarn fuer irgendeinen der direkten Vorfahren des // urspruenglichen xSearchLoop gefunden habe bHasMoreToSearch = sal_False; } } if (bHasMoreToSearch) - { // ich habe in xSearchLoop jetzt ein Interface eines 'Knotens' meines 'Baumes', den ich noch abtesten kann + { // ich habe in xSearchLoop jetzt ein Interface eines 'Knotens' meines 'Baumes', den ich noch abtesten kann if (ShouldHandleElement(xSearchLoop)) { m_xCurrentObject = xSearchLoop; @@ -148,7 +148,7 @@ IndexAccessIterator::~IndexAccessIterator() {} } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx index 80940a9bd048..197142f6c92b 100644 --- a/comphelper/source/container/containermultiplexer.cxx +++ b/comphelper/source/container/containermultiplexer.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 @@ -199,7 +199,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index ff5f89f22b51..8110af33857b 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.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 @@ -335,7 +335,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, uno::UNO_QUERY ); uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { (void)*pIter; @@ -1378,7 +1378,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo comphelper::EmbeddedObjectContainer aCnt( _xStorage ); const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); @@ -1493,7 +1493,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool sal_Bool bResult = sal_True; const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); @@ -1618,7 +1618,7 @@ sal_Bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< emb sal_Bool bError = sal_False; const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index b3864d9b8c06..b88c97a580a4 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 @@ -467,7 +467,7 @@ namespace comphelper ,public MapEnumeration_Base { public: - MapEnumeration( ::cppu::OWeakObject& _parentMap, MapData& _mapData, ::cppu::OBroadcastHelper& _rBHelper, + MapEnumeration( ::cppu::OWeakObject& _parentMap, MapData& _mapData, ::cppu::OBroadcastHelper& _rBHelper, const EnumerationType _type, const bool _isolated ) :ComponentBase( _rBHelper, ComponentBase::NoInitializationNeeded() ) ,m_xKeepMapAlive( _parentMap ) @@ -756,14 +756,14 @@ namespace comphelper ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, _Isolated ); } - + //-------------------------------------------------------------------- Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, _Isolated ); } - + //-------------------------------------------------------------------- Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException) { @@ -777,14 +777,14 @@ namespace comphelper ComponentMethodGuard aGuard( *this ); return m_aData.m_aKeyType; } - + //-------------------------------------------------------------------- Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException) { ComponentMethodGuard aGuard( *this ); return m_aData.m_aValueType; } - + //-------------------------------------------------------------------- void SAL_CALL EnumerableMap::clear( ) throw (NoSupportException, RuntimeException) { @@ -795,7 +795,7 @@ namespace comphelper lcl_notifyMapDataListeners_nothrow( m_aData ); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException) { @@ -805,7 +805,7 @@ namespace comphelper KeyedValues::const_iterator pos = m_aData.m_pValues->find( _key ); return ( pos != m_aData.m_pValues->end() ); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException) { @@ -822,7 +822,7 @@ namespace comphelper } return sal_False; } - + //-------------------------------------------------------------------- Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException) { @@ -835,7 +835,7 @@ namespace comphelper return pos->second; } - + //-------------------------------------------------------------------- Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException) { @@ -861,7 +861,7 @@ namespace comphelper return previousValue; } - + //-------------------------------------------------------------------- Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException) { @@ -983,7 +983,7 @@ namespace comphelper ComponentMethodGuard aGuard( *this ); return m_aEnumerator.hasMoreElements(); } - + //-------------------------------------------------------------------- Any SAL_CALL MapEnumeration::nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index e688c50ab4a6..da48f34f26aa 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.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 @@ -99,7 +99,7 @@ staruno::Any SAL_CALL OEnumerationByName::nextElement( ) m_xAccess.clear(); } - if (!aRes.hasValue()) // es gibt kein Element mehr + if (!aRes.hasValue()) // es gibt kein Element mehr throw starcontainer::NoSuchElementException(); return aRes; @@ -203,7 +203,7 @@ staruno::Any SAL_CALL OEnumerationByIndex::nextElement( ) } } - if (!aRes.hasValue()) // es gibt kein Element mehr + if (!aRes.hasValue()) // es gibt kein Element mehr throw starcontainer::NoSuchElementException(); return aRes; } @@ -284,7 +284,7 @@ staruno::Any SAL_CALL OAnyEnumeration::nextElement( ) { if ( ! hasMoreElements()) throw starcontainer::NoSuchElementException(); - + ::osl::ResettableMutexGuard aLock(m_aLock); sal_Int32 nPos = m_nPos; ++m_nPos; @@ -292,7 +292,7 @@ staruno::Any SAL_CALL OAnyEnumeration::nextElement( ) } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 48864d779326..f890387e3329 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.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/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 0e37c7a02e5e..7cae931ba161 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -73,9 +73,9 @@ namespace comphelper //----------------------------------------------------------------------------- struct AttachedObject_Impl { - Reference< XInterface > xTarget; + Reference< XInterface > xTarget; Sequence< Reference< XEventListener > > aAttachedListenerSeq; - Any aHelper; + Any aHelper; bool operator<( const AttachedObject_Impl & ) const; bool operator==( const AttachedObject_Impl & ) const; @@ -102,14 +102,14 @@ class ImplEventAttacherManager ::std::deque< AttacherIndex_Impl > aIndex; Mutex aLock; // Container fuer die ScriptListener - OInterfaceContainerHelper aScriptListeners; + OInterfaceContainerHelper aScriptListeners; // EventAttacher-Instanz - Reference< XEventAttacher > xAttacher; - Reference< XMultiServiceFactory > mxSMgr; - Reference< XIdlReflection > mxCoreReflection; - Reference< XIntrospection > mxIntrospection; - Reference< XTypeConverter > xConverter; - sal_Int16 nVersion; + Reference< XEventAttacher > xAttacher; + Reference< XMultiServiceFactory > mxSMgr; + Reference< XIdlReflection > mxCoreReflection; + Reference< XIntrospection > mxIntrospection; + Reference< XTypeConverter > xConverter; + sal_Int16 nVersion; public: ImplEventAttacherManager( const Reference< XIntrospection > & rIntrospection, const Reference< XMultiServiceFactory > rSMgr ); @@ -145,7 +145,7 @@ public: virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) throw( IOException, RuntimeException ); private: - Reference< XIdlReflection > getReflection() throw( Exception ); + Reference< XIdlReflection > getReflection() throw( Exception ); /** checks if <arg>_nIndex</arg> is a valid index, throws an <type>IllegalArgumentException</type> if not @param _nIndex @@ -164,11 +164,11 @@ private: // nur einzelne Events an einen allgemeinen AllListener weiterleitet class AttacherAllListener_Impl : public WeakImplHelper1< XAllListener > { - ImplEventAttacherManager* mpManager; + ImplEventAttacherManager* mpManager; Reference< XEventAttacherManager > xManager; - OUString aScriptType; - OUString aScriptCode; - sal_Int16 nVersion; + OUString aScriptType; + OUString aScriptCode; + sal_Int16 nVersion; void convertToEventReturn( Any & rRet, const Type & rRetType ) throw( CannotConvertException ); @@ -247,10 +247,10 @@ void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rR case TypeClass_FLOAT: rRet <<= float(0); break; case TypeClass_DOUBLE: rRet <<= double(0.0); break; case TypeClass_BYTE: rRet <<= sal_uInt8(0); break; - case TypeClass_SHORT: rRet <<= sal_Int16( 0 ); break; - case TypeClass_LONG: rRet <<= sal_Int32( 0 ); break; - case TypeClass_UNSIGNED_SHORT: rRet <<= sal_uInt16( 0 ); break; - case TypeClass_UNSIGNED_LONG: rRet <<= sal_uInt32( 0 ); break; + case TypeClass_SHORT: rRet <<= sal_Int16( 0 ); break; + case TypeClass_LONG: rRet <<= sal_Int32( 0 ); break; + case TypeClass_UNSIGNED_SHORT: rRet <<= sal_uInt16( 0 ); break; + case TypeClass_UNSIGNED_LONG: rRet <<= sal_uInt32( 0 ); break; default: OSL_ASSERT(false); @@ -323,13 +323,13 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even break; // none zero number -> return - case TypeClass_FLOAT: if( *((float*)aRet.getValue()) ) return aRet; break; - case TypeClass_DOUBLE: if( *((double*)aRet.getValue()) ) return aRet; break; - case TypeClass_BYTE: if( *((sal_uInt8*)aRet.getValue()) ) return aRet; break; - case TypeClass_SHORT: if( *((sal_Int16*)aRet.getValue()) ) return aRet; break; - case TypeClass_LONG: if( *((sal_Int32*)aRet.getValue()) ) return aRet; break; - case TypeClass_UNSIGNED_SHORT: if( *((sal_uInt16*)aRet.getValue()) ) return aRet; break; - case TypeClass_UNSIGNED_LONG: if( *((sal_uInt32*)aRet.getValue()) ) return aRet; break; + case TypeClass_FLOAT: if( *((float*)aRet.getValue()) ) return aRet; break; + case TypeClass_DOUBLE: if( *((double*)aRet.getValue()) ) return aRet; break; + case TypeClass_BYTE: if( *((sal_uInt8*)aRet.getValue()) ) return aRet; break; + case TypeClass_SHORT: if( *((sal_Int16*)aRet.getValue()) ) return aRet; break; + case TypeClass_LONG: if( *((sal_Int32*)aRet.getValue()) ) return aRet; break; + case TypeClass_UNSIGNED_SHORT: if( *((sal_uInt16*)aRet.getValue()) ) return aRet; break; + case TypeClass_UNSIGNED_LONG: if( *((sal_uInt32*)aRet.getValue()) ) return aRet; break; default: OSL_ASSERT(false); @@ -610,12 +610,12 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent Sequence< ScriptEventDescriptor >& rEventList = (*aIt).aEventList; ScriptEventDescriptor* pEventList = rEventList.getArray(); - const ScriptEventDescriptor* pEventListEnd = pEventList + rEventList.getLength(); + const ScriptEventDescriptor* pEventListEnd = pEventList + rEventList.getLength(); for( ; pEventList < pEventListEnd; ++pEventList ) { - if ( (aLstType == pEventList->ListenerType ) - && (EventMethod == pEventList->EventMethod ) - && (ToRemoveListenerParam == pEventList->AddListenerParam) + if ( (aLstType == pEventList->ListenerType ) + && (EventMethod == pEventList->EventMethod ) + && (ToRemoveListenerParam == pEventList->AddListenerParam) ) { ScriptEventDescriptor* pMoveTo = pEventList; diff --git a/comphelper/source/inc/comphelper_module.hxx b/comphelper/source/inc/comphelper_module.hxx index 9f8e32656715..e33868216139 100644 --- a/comphelper/source/inc/comphelper_module.hxx +++ b/comphelper/source/inc/comphelper_module.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx index 8ec3158c6789..82d6eb351af5 100644 --- a/comphelper/source/misc/SelectionMultiplex.cxx +++ b/comphelper/source/misc/SelectionMultiplex.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 @@ -151,7 +151,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour if (!locked()) m_pListener->_disposing(_rSource); // disconnect the listener - if (m_pListener) // may have been reset whilest calling into _disposing + if (m_pListener) // may have been reset whilest calling into _disposing m_pListener->setAdapter(NULL); } diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 8b6ebde6cc1c..03991ddfc424 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,10 +67,10 @@ namespace comphelper { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); - return ( _rPoint.X >= 0 ) - && ( _rPoint.Y >= 0 ) - && ( _rPoint.X < aBounds.Width ) - && ( _rPoint.Y < aBounds.Height ); + return ( _rPoint.X >= 0 ) + && ( _rPoint.Y >= 0 ) + && ( _rPoint.X < aBounds.Width ) + && ( _rPoint.Y < aBounds.Height ); } //-------------------------------------------------------------------- @@ -216,7 +216,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index 5dcda7148275..40baf72e69a9 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.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 @@ -53,24 +53,24 @@ namespace comphelper class OContextHelper_Impl { private: - OAccessibleContextHelper* m_pAntiImpl; // the owning instance - IMutex* m_pExternalLock; // the optional additional external lock + OAccessibleContextHelper* m_pAntiImpl; // the owning instance + IMutex* m_pExternalLock; // the optional additional external lock - ::cppu::OInterfaceContainerHelper* m_pEventListeners; - WeakReference< XAccessible > m_aCreator; // the XAccessible which created our XAccessibleContext + ::cppu::OInterfaceContainerHelper* m_pEventListeners; + WeakReference< XAccessible > m_aCreator; // the XAccessible which created our XAccessibleContext - AccessibleEventNotifier::TClientId m_nClientId; + AccessibleEventNotifier::TClientId m_nClientId; public: - inline Reference< XAccessible > getCreator( ) const { return m_aCreator; } - inline void setCreator( const Reference< XAccessible >& _rAcc ); + inline Reference< XAccessible > getCreator( ) const { return m_aCreator; } + inline void setCreator( const Reference< XAccessible >& _rAcc ); - inline IMutex* getExternalLock( ) { return m_pExternalLock; } - inline void setExternalLock( IMutex* _pLock ) { m_pExternalLock = _pLock; } + inline IMutex* getExternalLock( ) { return m_pExternalLock; } + inline void setExternalLock( IMutex* _pLock ) { m_pExternalLock = _pLock; } - inline AccessibleEventNotifier::TClientId - getClientId() const { return m_nClientId; } - inline void setClientId( const AccessibleEventNotifier::TClientId _nId ) + inline AccessibleEventNotifier::TClientId + getClientId() const { return m_nClientId; } + inline void setClientId( const AccessibleEventNotifier::TClientId _nId ) { m_nClientId = _nId; } public: @@ -84,7 +84,7 @@ namespace comphelper }; //--------------------------------------------------------------------- - inline void OContextHelper_Impl::setCreator( const Reference< XAccessible >& _rAcc ) + inline void OContextHelper_Impl::setCreator( const Reference< XAccessible >& _rAcc ) { m_aCreator = _rAcc; } @@ -289,7 +289,7 @@ namespace comphelper try { - + Reference< XAccessibleContext > xParentContext( implGetParentContext() ); // iterate over parent's children and search for this object @@ -302,7 +302,7 @@ namespace comphelper // two ideas why this could be NULL: // * nobody called our late ctor (init), so we never had a creator at all -> bad // * the creator is already dead. In this case, we should have been disposed, and - // never survived the above OContextEntryGuard. + // never survived the above OContextEntryGuard. // in all other situations the creator should be non-NULL if ( xCreator.is() ) @@ -351,7 +351,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/misc/accessibleeventbuffer.cxx b/comphelper/source/misc/accessibleeventbuffer.cxx index 4137f91853f7..de3a4a736c55 100644 --- a/comphelper/source/misc/accessibleeventbuffer.cxx +++ b/comphelper/source/misc/accessibleeventbuffer.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/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index f03b1e78485a..1e8607e73ebf 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.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 @@ -42,12 +42,12 @@ using namespace ::comphelper; //= AccessibleEventNotifier //===================================================================== //--------------------------------------------------------------------- -namespace +namespace { - struct lclMutex + struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex > {}; - struct Clients - : public rtl::Static< AccessibleEventNotifier::ClientMap, Clients > {}; + struct Clients + : public rtl::Static< AccessibleEventNotifier::ClientMap, Clients > {}; } //......................................................................... @@ -66,7 +66,7 @@ namespace comphelper // Note that the following relies on the fact the elements in the map are traveled with // ascending keys (aka client ids) AccessibleEventNotifier::ClientMap &rClients = Clients::get(); - for ( ClientMap::const_iterator aLookup = rClients.begin(); + for ( ClientMap::const_iterator aLookup = rClients.begin(); aLookup != rClients.end(); ++aLookup ) @@ -75,7 +75,7 @@ namespace comphelper OSL_ENSURE( nCurrent > nBiggestUsedId, "AccessibleEventNotifier::generateId: map is expected to be sorted ascending!" ); if ( nCurrent - nBiggestUsedId > 1 ) - { // found a "gap" + { // found a "gap" nFreeId = nBiggestUsedId + 1; break; } @@ -255,7 +255,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx index ee98678f0b70..07e1e11949cb 100644 --- a/comphelper/source/misc/accessiblekeybindinghelper.cxx +++ b/comphelper/source/misc/accessiblekeybindinghelper.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 @@ -52,7 +52,7 @@ namespace comphelper } // ----------------------------------------------------------------------------- - + OAccessibleKeyBindingHelper::OAccessibleKeyBindingHelper( const OAccessibleKeyBindingHelper& rHelper ) : cppu::WeakImplHelper1<XAccessibleKeyBinding>( rHelper ) , m_aKeyBindings( rHelper.m_aKeyBindings ) @@ -111,7 +111,7 @@ namespace comphelper // ----------------------------------------------------------------------------- //.............................................................................. -} // namespace comphelper +} // namespace comphelper //.............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index e6aeac52eac4..88d0c35159b7 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.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 @@ -188,7 +188,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index d344192e7b46..6edc3df43020 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ namespace comphelper rBoundary = xBreakIter->getWordBoundary( sText, nIndex, implGetLocale(), i18n::WordType::ANY_WORD, sal_True ); // it's a word, if the first character is an alpha-numeric character - Reference< i18n::XCharacterClassification > xCharClass = implGetCharacterClassification(); + Reference< i18n::XCharacterClassification > xCharClass = implGetCharacterClassification(); if ( xCharClass.is() ) { sal_Int32 nType = xCharClass->getCharacterType( sText, rBoundary.startPos, implGetLocale() ); @@ -193,7 +193,7 @@ namespace comphelper if ( implIsValidIndex( nIndex, sText.getLength() ) ) { Locale aLocale = implGetLocale(); - Reference < i18n::XBreakIterator > xBreakIter = implGetBreakIterator(); + Reference < i18n::XBreakIterator > xBreakIter = implGetBreakIterator(); if ( xBreakIter.is() ) { rBoundary.endPos = xBreakIter->endOfSentence( sText, nIndex, aLocale ); @@ -241,7 +241,7 @@ namespace comphelper sal_Int32 nLength = sText.getLength(); if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) - { + { rBoundary.startPos = 0; rBoundary.endPos = nLength; } @@ -378,7 +378,7 @@ namespace comphelper } break; case AccessibleTextType::WORD: - { + { // get word at index sal_Bool bWord = implGetWordBoundary( aBoundary, nIndex ); if ( bWord && implIsValidBoundary( aBoundary, nLength ) ) @@ -609,7 +609,7 @@ namespace comphelper aResult.SegmentStart = aBoundary.startPos; aResult.SegmentEnd = aBoundary.endPos; } - } + } } break; case AccessibleTextType::WORD: @@ -699,37 +699,37 @@ namespace comphelper // ----------------------------------------------------------------------------- bool OCommonAccessibleText::implInitTextChangedEvent( - const rtl::OUString& rOldString, - const rtl::OUString& rNewString, + const rtl::OUString& rOldString, + const rtl::OUString& rNewString, ::com::sun::star::uno::Any& rDeleted, ::com::sun::star::uno::Any& rInserted) // throw() { sal_uInt32 nLenOld = rOldString.getLength(); sal_uInt32 nLenNew = rNewString.getLength(); - + // equal if ((0 == nLenOld) && (0 == nLenNew)) return false; TextSegment aDeletedText; - TextSegment aInsertedText; - + TextSegment aInsertedText; + aDeletedText.SegmentStart = -1; - aDeletedText.SegmentEnd = -1; + aDeletedText.SegmentEnd = -1; aInsertedText.SegmentStart = -1; aInsertedText.SegmentEnd = -1; - - // insert only + + // insert only if ((0 == nLenOld) && (nLenNew > 0)) { aInsertedText.SegmentStart = 0; aInsertedText.SegmentEnd = nLenNew; aInsertedText.SegmentText = rNewString.copy( aInsertedText.SegmentStart, aInsertedText.SegmentEnd - aInsertedText.SegmentStart ); - rInserted <<= aInsertedText; + rInserted <<= aInsertedText; return true; } - + // delete only if ((nLenOld > 0) && (0 == nLenNew)) { @@ -737,28 +737,28 @@ namespace comphelper aDeletedText.SegmentEnd = nLenOld; aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart ); - rDeleted <<= aDeletedText; + rDeleted <<= aDeletedText; return true; } - + const sal_Unicode* pFirstDiffOld = rOldString.getStr(); - const sal_Unicode* pLastDiffOld = rOldString.getStr() + nLenOld; + const sal_Unicode* pLastDiffOld = rOldString.getStr() + nLenOld; const sal_Unicode* pFirstDiffNew = rNewString.getStr(); const sal_Unicode* pLastDiffNew = rNewString.getStr() + nLenNew; - + // find first difference - while ((*pFirstDiffOld == *pFirstDiffNew) && - (pFirstDiffOld < pLastDiffOld) && + while ((*pFirstDiffOld == *pFirstDiffNew) && + (pFirstDiffOld < pLastDiffOld) && (pFirstDiffNew < pLastDiffNew)) { pFirstDiffOld++; - pFirstDiffNew++; - } - + pFirstDiffNew++; + } + // equality test if ((0 == *pFirstDiffOld) && (0 == *pFirstDiffNew)) return false; - + // find last difference while ( ( pLastDiffOld > pFirstDiffOld) && ( pLastDiffNew > pFirstDiffNew) && @@ -767,27 +767,27 @@ namespace comphelper pLastDiffOld--; pLastDiffNew--; } - + if (pFirstDiffOld < pLastDiffOld) - { - aDeletedText.SegmentStart = pFirstDiffOld - rOldString.getStr(); + { + aDeletedText.SegmentStart = pFirstDiffOld - rOldString.getStr(); aDeletedText.SegmentEnd = pLastDiffOld - rOldString.getStr(); - aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart ); - + aDeletedText.SegmentText = rOldString.copy( aDeletedText.SegmentStart, aDeletedText.SegmentEnd - aDeletedText.SegmentStart ); + rDeleted <<= aDeletedText; } - + if (pFirstDiffNew < pLastDiffNew) { aInsertedText.SegmentStart = pFirstDiffNew - rNewString.getStr(); aInsertedText.SegmentEnd = pLastDiffNew - rNewString.getStr(); aInsertedText.SegmentText = rNewString.copy( aInsertedText.SegmentStart, aInsertedText.SegmentEnd - aInsertedText.SegmentStart ); - + rInserted <<= aInsertedText; } return true; } - + //============================================================================== // OAccessibleTextHelper //============================================================================== @@ -822,8 +822,8 @@ namespace comphelper sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getCharacter( nIndex ); + + return OCommonAccessibleText::getCharacter( nIndex ); } // ----------------------------------------------------------------------------- @@ -831,8 +831,8 @@ namespace comphelper sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getCharacterCount(); + + return OCommonAccessibleText::getCharacterCount(); } // ----------------------------------------------------------------------------- @@ -840,8 +840,8 @@ namespace comphelper ::rtl::OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getSelectedText(); + + return OCommonAccessibleText::getSelectedText(); } // ----------------------------------------------------------------------------- @@ -849,7 +849,7 @@ namespace comphelper sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getSelectionStart(); } @@ -858,8 +858,8 @@ namespace comphelper sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getSelectionEnd(); + + return OCommonAccessibleText::getSelectionEnd(); } // ----------------------------------------------------------------------------- @@ -867,7 +867,7 @@ namespace comphelper ::rtl::OUString OAccessibleTextHelper::getText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getText(); } @@ -876,8 +876,8 @@ namespace comphelper ::rtl::OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); - - return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); + + return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } // ----------------------------------------------------------------------------- @@ -885,7 +885,7 @@ namespace comphelper TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } @@ -894,7 +894,7 @@ namespace comphelper TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } @@ -903,14 +903,14 @@ namespace comphelper TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OExternalLockGuard aGuard( this ); - + return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } // ----------------------------------------------------------------------------- //.............................................................................. -} // namespace comphelper +} // namespace comphelper //.............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 2220e15563b9..d89fb9080b73 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.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 @@ -35,10 +35,10 @@ #include <algorithm> -using namespace ::comphelper; -using namespace ::com::sun::star::accessibility; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; +using namespace ::comphelper; +using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; //............................................................................. namespace comphelper @@ -53,7 +53,7 @@ namespace comphelper : public ::std::unary_function< AccessibleMap::value_type, void > { private: - Reference< XEventListener > m_xListener; + Reference< XEventListener > m_xListener; public: RemoveEventListener( const Reference< XEventListener >& _rxListener ) @@ -113,7 +113,7 @@ namespace comphelper { AccessibleMap::iterator aRemovedPos = m_aChildrenMap.find( _rxKey ); if ( m_aChildrenMap.end() != aRemovedPos ) - { // it was cached + { // it was cached // remove ourself as event listener RemoveEventListener aOperator( this ); aOperator( *aRemovedPos ); @@ -134,7 +134,7 @@ namespace comphelper //------------------------------------------------------------------------- Reference< XAccessible > OWrappedAccessibleChildrenManager::getAccessibleWrapperFor( - const Reference< XAccessible >& _rxKey, sal_Bool _bCreate ) + const Reference< XAccessible >& _rxKey, sal_Bool _bCreate ) { Reference< XAccessible > xValue; @@ -151,7 +151,7 @@ namespace comphelper xValue = aPos->second; } else if ( _bCreate ) - { // not found in the cache, and allowed to create + { // not found in the cache, and allowed to create // -> new wrapper xValue = new OAccessibleWrapper( m_xORB, _rxKey, (Reference< XAccessible >)m_aOwningAccessible ); @@ -259,7 +259,7 @@ namespace comphelper void OWrappedAccessibleChildrenManager::handleChildNotification( const AccessibleEventObject& _rEvent ) { if ( AccessibleEventId::INVALIDATE_ALL_CHILDREN == _rEvent.EventId ) - { // clear our child map + { // clear our child map invalidateAll( ); } else if ( AccessibleEventId::CHILD == _rEvent.EventId ) @@ -326,7 +326,7 @@ namespace comphelper { if ( !m_rBHelper.bDisposed ) { - acquire(); // to prevent duplicate dtor calls + acquire(); // to prevent duplicate dtor calls dispose(); } } @@ -680,7 +680,7 @@ namespace comphelper } //............................................................................. -} // namespace accessibility +} // namespace accessibility //............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index 65dfd98364c9..45b9edaf9ed5 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.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 @@ -40,7 +40,7 @@ namespace comphelper { //......................................................................... -#define BITFIELDSIZE ( sizeof( sal_Int64 ) * 8 ) +#define BITFIELDSIZE ( sizeof( sal_Int64 ) * 8 ) // maximum number of bits we have in a sal_Int64 using ::com::sun::star::uno::Reference; @@ -57,17 +57,17 @@ namespace comphelper //===================================================================== struct OAccImpl_Impl { - Reference< XAccessible > m_xAccParent; - sal_Int64 m_nForeignControlledStates; + Reference< XAccessible > m_xAccParent; + sal_Int64 m_nForeignControlledStates; }; - + //===================================================================== //= OAccessibleImplementationAccess //===================================================================== //--------------------------------------------------------------------- OAccessibleImplementationAccess::OAccessibleImplementationAccess( ) - :m_pImpl( new OAccImpl_Impl ) + :m_pImpl( new OAccImpl_Impl ) { } @@ -111,7 +111,7 @@ namespace comphelper //--------------------------------------------------------------------- sal_Bool OAccessibleImplementationAccess::setForeignControlledState( const Reference< XAccessibleContext >& _rxComponent, const sal_Int16 _nState, - const sal_Bool _bSet ) + const sal_Bool _bSet ) { OAccessibleImplementationAccess* pImplementation = getImplementation( _rxComponent ); @@ -143,8 +143,8 @@ namespace comphelper { sal_Int64 nReturn( 0 ); - if ( ( _rIdentifier.getLength() == 16 ) - && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) ) + if ( ( _rIdentifier.getLength() == 16 ) + && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) ) ) nReturn = reinterpret_cast< sal_Int64 >( this ); @@ -184,7 +184,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx index bdb6d44d6e1f..306891b74cd9 100644 --- a/comphelper/source/misc/anytostring.cxx +++ b/comphelper/source/misc/anytostring.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ void appendValue( rtl::OUStringBuffer & buf, buf.append( rtl::OUString::unacquired( &typeRef->pTypeName ) ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(") ") ); } - + switch (typeRef->eTypeClass) { case typelib_TypeClass_INTERFACE: { buf.append( static_cast<sal_Unicode>('@') ); @@ -114,7 +114,7 @@ void appendValue( rtl::OUStringBuffer & buf, reinterpret_cast< typelib_CompoundTypeDescription * >( typeDescr ); sal_Int32 nDescr = compType->nMembers; - + if (compType->pBaseTypeDescription) { appendValue( buf, val, reinterpret_cast< @@ -123,12 +123,12 @@ void appendValue( rtl::OUStringBuffer & buf, if (nDescr > 0) buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", ") ); } - + typelib_TypeDescriptionReference ** ppTypeRefs = compType->ppTypeRefs; sal_Int32 * memberOffsets = compType->pMemberOffsets; rtl_uString ** ppMemberNames = compType->ppMemberNames; - + for ( sal_Int32 nPos = 0; nPos < nDescr; ++nPos ) { buf.append( ppMemberNames[ nPos ] ); @@ -176,7 +176,7 @@ void appendValue( rtl::OUStringBuffer & buf, uno_Sequence * seq = *static_cast< uno_Sequence * const * >(val); sal_Int32 nElements = seq->nElements; - + if (nElements > 0) { buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") ); diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index 5697eb62b6b5..f68fda46b9b3 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.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/comphelper/source/misc/comphelper_module.cxx b/comphelper/source/misc/comphelper_module.cxx index 8b9ee4221dfc..2ac0fc7e262b 100644 --- a/comphelper/source/misc/comphelper_module.cxx +++ b/comphelper/source/misc/comphelper_module.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx index b9cc41fe5b09..74c29f7bd4e6 100644 --- a/comphelper/source/misc/comphelper_services.cxx +++ b/comphelper/source/misc/comphelper_services.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx index d6aa3c5fd50c..0ec5cc0ca93e 100644 --- a/comphelper/source/misc/componentbase.cxx +++ b/comphelper/source/misc/componentbase.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx index 072cafbcee4c..3334ee1aafc1 100644 --- a/comphelper/source/misc/componentcontext.cxx +++ b/comphelper/source/misc/componentcontext.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/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index f3239dd59846..9caf52966980 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.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/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index 1016c88b341c..7ce1bba11dc9 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.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/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index ccc680729482..9a0c8a0e498a 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.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 @@ namespace comphelper { static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength ) { uno::Sequence< sal_Int8 > aResult; - + if ( aPassword.getLength() && aSalt.getLength() && nCount && nHashLength ) { ::rtl::OString aBytePass = ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ); @@ -91,7 +91,7 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo TimeValue aTime; osl_getSystemTime( &aTime ); rtlRandomPool aRandomPool = rtl_random_createPool (); - rtl_random_addBytes ( aRandomPool, &aTime, 8 ); + rtl_random_addBytes ( aRandomPool, &aTime, 8 ); rtl_random_getBytes ( aRandomPool, aSalt.getArray(), 16 ); @@ -157,9 +157,9 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPas sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32( const ::rtl::OUString& aUString ) { - static sal_uInt16 pInitialCode[] = { + static sal_uInt16 pInitialCode[] = { 0xE1F0, // 1 - 0x1D0F, // 2 + 0x1D0F, // 2 0xCC9C, // 3 0x84C0, // 4 0x110C, // 5 @@ -243,7 +243,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetWordHashAsSequence( return aResult; } - + // ============================================================================ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16( const ::rtl::OUString& aUString, @@ -281,7 +281,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( return aResult; } - + // ============================================================================ /*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword( diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index a4381a3d89c7..49e941601123 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.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 @@ -142,7 +142,7 @@ DocPasswordRequest::~DocPasswordRequest() static_cast< XWeak* > ( this ), // my own interfaces static_cast< XInteractionRequest* > ( this ) ); -} +} void SAL_CALL DocPasswordRequest::acquire( ) throw () { @@ -152,7 +152,7 @@ void SAL_CALL DocPasswordRequest::acquire( ) throw () void SAL_CALL DocPasswordRequest::release( ) throw () { OWeakObject::release(); -} +} sal_Bool DocPasswordRequest::isAbort() const { diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index c1884ba513c2..256c50f93f91 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ namespace comphelper { // 5. // <-- #i88104# (05-16-08) TKR: use the new XTitle Interface to get the Title --> - + Reference< XTitle > xTitle( _rxDocument, UNO_QUERY ); if ( xTitle.is() ) { diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index fdc17013a6d9..c4b77338e798 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.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/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 90acd7f9152b..a01a37de2eae 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.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/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx index 3d10c0d76ad8..2459d9160303 100644 --- a/comphelper/source/misc/evtlistenerhlp.cxx +++ b/comphelper/source/misc/evtlistenerhlp.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/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx index 1101a473e716..4fe780630718 100644 --- a/comphelper/source/misc/evtmethodhelper.cxx +++ b/comphelper/source/misc/evtmethodhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ namespace comphelper { typelib_InterfaceTypeDescription *pType=0; type.getDescription( (typelib_TypeDescription**)&pType); - + if(!pType) return Sequence< ::rtl::OUString>(); - + Sequence< ::rtl::OUString> aNames(pType->nMembers); ::rtl::OUString* pNames = aNames.getArray(); for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames) diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx index 7d9ef608a1ae..5ee98ca4c1ba 100644 --- a/comphelper/source/misc/ihwrapnofilter.cxx +++ b/comphelper/source/misc/ihwrapnofilter.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/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index c71f84b62309..d45671a9e151 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.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 @@ -140,7 +140,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg if ( m_bDisposed ) throw lang::DisposedException(); // TODO - + if ( !m_refCount ) throw uno::RuntimeException(); // the object must be refcounted already! @@ -167,7 +167,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg !( aArguments[1] >>= nModes ) || ( !( nModes & embed::Actions::PREVENT_CLOSE ) && - !( nModes & embed::Actions::PREVENT_TERMINATION ) + !( nModes & embed::Actions::PREVENT_TERMINATION ) ) ) { @@ -183,7 +183,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("If the third argument is provided, it must be XActionsApproval implementation!" ) ), uno::Reference< uno::XInterface >(), 0 ); - + m_pLockListener = new OLockListener( uno::Reference< lang::XComponent > ( static_cast< lang::XComponent* >( this ) ), xInstance, nModes, @@ -309,7 +309,7 @@ void OLockListener::Dispose() catch( uno::Exception& ) {} } - + m_xInstance = uno::Reference< uno::XInterface >(); m_bDisposed = sal_True; } diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index 809aced6e3c1..e271bc2c94ba 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper3< ::com::sun::star::lang:: OLockListener* m_pLockListener; ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners - + sal_Bool m_bDisposed; sal_Bool m_bInitialized; @@ -73,7 +73,7 @@ public: static ::rtl::OUString SAL_CALL getImplementationName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create( + Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XComponent @@ -107,7 +107,7 @@ class OLockListener : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XC sal_Int32 m_nMode; public: - OLockListener( const ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent >& xWrapper, + OLockListener( const ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent >& xWrapper, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInstance, sal_Int32 nMode, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XActionsApproval > xApproval ); diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index 7a69ac4d5cbb..caae6cda0bc3 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.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 @@ namespace comphelper { m_sPassword = _Password;; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException) { @@ -94,7 +94,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/misc/legacysingletonfactory.cxx b/comphelper/source/misc/legacysingletonfactory.cxx index d469d2512c4f..53b76c7d2f52 100644 --- a/comphelper/source/misc/legacysingletonfactory.cxx +++ b/comphelper/source/misc/legacysingletonfactory.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 @@ -128,7 +128,7 @@ namespace comphelper { return m_sImplementationName; } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL LegacySingletonFactory::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) { @@ -137,7 +137,7 @@ namespace comphelper const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, _rServiceName ) != pEnd; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL LegacySingletonFactory::getSupportedServiceNames( ) throw (RuntimeException) { @@ -165,7 +165,7 @@ namespace comphelper return m_xTheInstance; } - + //-------------------------------------------------------------------- Reference< XInterface > SAL_CALL LegacySingletonFactory::createInstanceWithArgumentsAndContext( const Sequence< Any >& _rArguments, const Reference< XComponentContext >& _rxContext ) throw (Exception, RuntimeException) { diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx index 0f7823a197c7..23bf563993b2 100644 --- a/comphelper/source/misc/listenernotification.cxx +++ b/comphelper/source/misc/listenernotification.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 @@ -60,7 +60,7 @@ namespace comphelper if ( _rxListener.is() ) m_aListeners.addInterface( _rxListener ); } - + //-------------------------------------------------------------------- void OListenerContainer::impl_removeListener( const Reference< XEventListener >& _rxListener ) { diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx index d6fa3873110d..e08f5aa57f8e 100644 --- a/comphelper/source/misc/locale.cxx +++ b/comphelper/source/misc/locale.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ const Locale Locale::X_DEFAULT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -59,7 +59,7 @@ const Locale Locale::EN() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -68,7 +68,7 @@ const Locale Locale::EN_US() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -77,7 +77,7 @@ const Locale Locale::DE_DE() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -86,7 +86,7 @@ const Locale Locale::DE_CH() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CH"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -95,7 +95,7 @@ const Locale Locale::DE_AT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AT"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -104,7 +104,7 @@ const Locale Locale::AR() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ar")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -113,7 +113,7 @@ const Locale Locale::CA() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ca")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -122,7 +122,7 @@ const Locale Locale::CS() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cs")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -131,7 +131,7 @@ const Locale Locale::DA() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("da")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -140,7 +140,7 @@ const Locale Locale::EL() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("el")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -149,7 +149,7 @@ const Locale Locale::ES() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("es")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -158,7 +158,7 @@ const Locale Locale::FI() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fi")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -167,7 +167,7 @@ const Locale Locale::FR() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fr")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -176,7 +176,7 @@ const Locale Locale::HE() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -185,7 +185,7 @@ const Locale Locale::HI_IN() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hi")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -194,7 +194,7 @@ const Locale Locale::HU() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hu")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -203,7 +203,7 @@ const Locale Locale::IT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("it")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -212,7 +212,7 @@ const Locale Locale::JA() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ja")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -221,7 +221,7 @@ const Locale Locale::KO() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ko")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -230,7 +230,7 @@ const Locale Locale::NL() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nl")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -239,7 +239,7 @@ const Locale Locale::PL() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pl")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -248,7 +248,7 @@ const Locale Locale::PT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pt")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -257,7 +257,7 @@ const Locale Locale::PT_BR() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pt")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BR"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -266,7 +266,7 @@ const Locale Locale::RU() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ru")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -275,7 +275,7 @@ const Locale Locale::SK() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sk")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -284,7 +284,7 @@ const Locale Locale::SL() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sl")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -293,7 +293,7 @@ const Locale Locale::SV() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sv")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -302,7 +302,7 @@ const Locale Locale::TH() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -311,7 +311,7 @@ const Locale Locale::TR() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tr")), ::rtl::OUString()); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -320,7 +320,7 @@ const Locale Locale::X_COMMENT() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("comment"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -329,7 +329,7 @@ const Locale Locale::X_TRANSLATE() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("translate"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -338,7 +338,7 @@ const Locale Locale::X_NOTRANSLATE() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notranslate"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -347,7 +347,7 @@ const Locale Locale::ZH_CN() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zh")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CN"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -356,7 +356,7 @@ const Locale Locale::ZH_TW() static Locale aLocale( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zh")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TW"))); - return aLocale; + return aLocale; } //----------------------------------------------- @@ -390,7 +390,7 @@ Locale::Locale(const Locale& aCopy) { (*this) = aCopy; // recycle assign operator } - + //----------------------------------------------- ::rtl::OUString Locale::getLanguage() const { @@ -439,13 +439,13 @@ void Locale::fromISO(const ::rtl::OUString& sISO) m_sLanguage = ::rtl::OUString(); m_sCountry = ::rtl::OUString(); m_sVariant = ::rtl::OUString(); - + ::rtl::OUString sParser(sISO); sParser.trim(); sal_Int32 nStart = 0; sal_Int32 nEnd = 0; - + // extract language part nEnd = sParser.indexOf(SEPERATOR_LC, nStart); if (nEnd<0) @@ -455,7 +455,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO) } setLanguage(sParser.copy(nStart, nEnd-nStart)); nStart = nEnd+1; - + // extract country nEnd = sParser.indexOf(SEPERATOR_CV, nStart); if (nEnd<0) @@ -466,7 +466,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO) return; } nStart = nEnd+1; - + // extract variant setVariant(sParser.copy(nStart, sParser.getLength()-nStart)); } @@ -475,7 +475,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO) ::rtl::OUString Locale::toISO() const { ::rtl::OUStringBuffer sISO(64); - + sISO.append(m_sLanguage); if (m_sCountry.getLength()) { @@ -488,7 +488,7 @@ void Locale::fromISO(const ::rtl::OUString& sISO) sISO.append(m_sVariant); } } - + return sISO.makeStringAndClear(); } @@ -514,21 +514,21 @@ sal_Bool Locale::similar(const Locale& aComparable) const throw(Locale::MalFormedLocaleException) { Locale aReference(sReferenceISO); - + // Note: The same language or "en"/"en-US" should be preferred as fallback. // On the other side some localized variables doesnt use localzation in real. // May be the use a "fix" value only ... marked as X-DEFAULT or X-NOTRANSLATE. // At least it can be discussed, if any language is a valid fallback ... // But in case some office functionality depends on that (that means real functionality instead // of pure UI descriptions) we should do anything, so it can work. - + ::std::vector< ::rtl::OUString >::const_iterator pSimilar = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pEN_US = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pEN = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pXDefault = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pXNoTranslate = lISOList.end(); ::std::vector< ::rtl::OUString >::const_iterator pAny = lISOList.end(); - + ::std::vector< ::rtl::OUString >::const_iterator pIt; for ( pIt = lISOList.begin(); pIt != lISOList.end() ; @@ -538,7 +538,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const // found Locale, which match with 100% => return it if (aCheck.equals(aReference)) return pIt; - + // found similar Locale => safe it as possible fallback if ( (pSimilar == lISOList.end()) && @@ -592,22 +592,22 @@ sal_Bool Locale::similar(const Locale& aComparable) const if (pSimilar != lISOList.end()) return pSimilar; - + if (pEN_US != lISOList.end()) return pEN_US; - + if (pEN != lISOList.end()) return pEN; if (pXDefault != lISOList.end()) return pXDefault; - + if (pXNoTranslate != lISOList.end()) return pXNoTranslate; - + if (pAny != lISOList.end()) return pAny; - + return lISOList.end(); } @@ -645,7 +645,7 @@ sal_Bool Locale::getFallback(Locale& aLocale) aLocale.setCountry(::rtl::OUString()); return sal_True; } - + // e) "en-US" possible? if (!aLocale.equals(EN_US())) { @@ -653,9 +653,9 @@ sal_Bool Locale::getFallback(Locale& aLocale) return sal_True; } - // f) no more fallbacks + // f) no more fallbacks return sal_False; -} +} //----------------------------------------------- void Locale::operator=(const Locale& rCopy) @@ -667,7 +667,7 @@ void Locale::operator=(const Locale& rCopy) m_sCountry = rCopy.m_sCountry; m_sVariant = rCopy.m_sVariant; } - + //----------------------------------------------- sal_Bool Locale::operator==(const Locale& aComparable) const { diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index 48b99a6ff94d..f9467998c48c 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.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/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 83f54ff027ea..d7bc4deb961e 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.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 @@ -603,7 +603,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) { ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("Invalid MediaDescriptor detected:\n"); - sMsg.append (ex.Message ); + sMsg.append (ex.Message ); OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); } #else diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index a61e8a36a27c..2f3f5e445a74 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.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 @@ -750,7 +750,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( } catch( uno::Exception& ) {} - + return aResult; } //------------------------------------------------------------------------- @@ -790,7 +790,7 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt3 return aResult; } -uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName) +uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName) { uno::Sequence<sal_Int8> aClassId; uno::Reference< container::XNameAccess > xObjectNames = GetConfigurationByPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Embedding/ObjectNames"))); diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 74a37e278185..2031a338cb4e 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.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 @@ -313,7 +313,7 @@ namespace comphelper NamedValue operator()( const NamedValueRepository::value_type& _rValue ) { return NamedValue( _rValue.first, _rValue.second ); - } + } }; } diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx index a011964b91fa..47525f5d0c19 100644 --- a/comphelper/source/misc/numbers.cxx +++ b/comphelper/source/misc/numbers.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 @@ -40,8 +40,8 @@ namespace comphelper { //......................................................................... -namespace starbeans = ::com::sun::star::beans; -namespace starlang = ::com::sun::star::lang; +namespace starbeans = ::com::sun::star::beans; +namespace starlang = ::com::sun::star::lang; //------------------------------------------------------------------------------ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey) @@ -146,7 +146,7 @@ Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx index 942a8e618261..0703f8e46d7c 100644 --- a/comphelper/source/misc/officeresourcebundle.cxx +++ b/comphelper/source/misc/officeresourcebundle.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/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index 6c1f38b15ff9..774918ca992e 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.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 @@ -145,7 +145,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) xFactory->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), m_xContext ), uno::UNO_QUERY_THROW ); - + // Turn Quickstarter veto off uno::Reference< beans::XPropertySet > xPropertySet( xDesktop, uno::UNO_QUERY_THROW ); ::rtl::OUString aVetoPropName( RTL_CONSTASCII_USTRINGPARAM( "SuspendQuickstartVeto" ) ); diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index c0aabf65d531..1fe44d681c59 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.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/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index b24aa4407356..19307d794ff6 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.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 @@ -163,10 +163,10 @@ namespace comphelper // // if ( !m_rBHelper.bDisposed ) // { - // acquire(); // to prevent duplicate dtor calls + // acquire(); // to prevent duplicate dtor calls // dispose(); // } - + m_xInner.clear(); } @@ -174,9 +174,9 @@ namespace comphelper void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException) { if ( _rSource.Source == m_xInner ) - { // it's our inner context which is dying -> dispose ourself + { // it's our inner context which is dying -> dispose ourself if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose ) - { // (if necessary only, of course) + { // (if necessary only, of course) dispose(); } } @@ -243,7 +243,7 @@ namespace comphelper { if ( !rBHelper.bDisposed ) { - acquire(); // to prevent duplicate dtor calls + acquire(); // to prevent duplicate dtor calls dispose(); } } @@ -272,7 +272,7 @@ namespace comphelper //............................................................................. -} // namespace comphelper +} // namespace comphelper //............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/querydeep.cxx b/comphelper/source/misc/querydeep.cxx index 61cfb6c173f2..348d038383c2 100644 --- a/comphelper/source/misc/querydeep.cxx +++ b/comphelper/source/misc/querydeep.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 @@ -60,8 +60,8 @@ sal_Bool comphelper::isDerivedFrom( // now ask in cppu (aka typelib) ::typelib_TypeDescription *pBaseTD = 0, *pTD = 0; - rBaseType. getDescription(&pBaseTD); - rType. getDescription(&pTD); + rBaseType. getDescription(&pBaseTD); + rType. getDescription(&pTD); // interfaces are assignable to a base bRet = ::typelib_typedescription_isAssignableFrom(pBaseTD, pTD); diff --git a/comphelper/source/misc/regpathhelper.cxx b/comphelper/source/misc/regpathhelper.cxx index 898d1224b091..7fa3548cf744 100644 --- a/comphelper/source/misc/regpathhelper.cxx +++ b/comphelper/source/misc/regpathhelper.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 @@ -41,18 +41,18 @@ using namespace osl; using namespace rtl; -#define PATH_DELEMITTER '/' +#define PATH_DELEMITTER '/' -#define USER_REGISTRY_NAME_ENV "STAR_USER_REGISTRY" -#define SYSTEM_REGISTRY_NAME_ENV "STAR_REGISTRY" -#define REGISTRY_SYSTEM_NAME "services.rdb" +#define USER_REGISTRY_NAME_ENV "STAR_USER_REGISTRY" +#define SYSTEM_REGISTRY_NAME_ENV "STAR_REGISTRY" +#define REGISTRY_SYSTEM_NAME "services.rdb" -#define REGISTRY_LOCAL_NAME "user60.rdb" +#define REGISTRY_LOCAL_NAME "user60.rdb" #ifdef SAL_UNX -#define CONFIG_PATH_PREFIX "." +#define CONFIG_PATH_PREFIX "." #else -#define CONFIG_PATH_PREFIX "" +#define CONFIG_PATH_PREFIX "" #endif namespace comphelper @@ -103,7 +103,7 @@ static OUString getDefaultLocalRegistry() OUString portalUserDir; sal_Bool bIsPortalUser = retrievePortalUserDir( &portalUserDir ); - + if ( bIsPortalUser ) { if( portalUserDir.getLength() ) @@ -112,7 +112,7 @@ static OUString getDefaultLocalRegistry() userRegistryName = portalUserDir; userRegistryName += OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/" REGISTRY_LOCAL_NAME ) ); - + // Directory creation is probably necessary for bootstrapping a new // user in the portal environment (the ucb uses this function). // This should be solved differently, as @@ -120,7 +120,7 @@ static OUString getDefaultLocalRegistry() OUString sSeparator(RTL_CONSTASCII_USTRINGPARAM("/")); OUString sPath(RTL_CONSTASCII_USTRINGPARAM("file://")); FileBase::RC retRC = FileBase::E_None; - + sal_Int32 nIndex = 3; sPath += userRegistryName.getToken(2, '/', nIndex); while( nIndex != -1 ) @@ -155,8 +155,8 @@ static OUString getDefaultLocalRegistry() OUString getPathToUserRegistry() { - OUString userRegistryName; - FILE *f=NULL; + OUString userRegistryName; + FILE *f=NULL; // search the environment STAR_USER_REGISTRY OString sBuffer( getenv(USER_REGISTRY_NAME_ENV) ); @@ -184,12 +184,12 @@ OUString getPathToSystemRegistry() OUString uBuffer; OUString registryBaseName( RTL_CONSTASCII_USTRINGPARAM(REGISTRY_SYSTEM_NAME) ); OUString systemRegistryName; - FILE *f=NULL; + FILE *f=NULL; // search in the directory of the executable if(osl_Process_E_None == osl_getExecutableFile(&uBuffer.pData)) { - sal_uInt32 lastIndex = uBuffer.lastIndexOf(PATH_DELEMITTER); + sal_uInt32 lastIndex = uBuffer.lastIndexOf(PATH_DELEMITTER); if (lastIndex > 0) { uBuffer = uBuffer.copy(0, lastIndex + 1); diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx index 63ec42befb02..c194e98e5e8d 100644 --- a/comphelper/source/misc/scopeguard.cxx +++ b/comphelper/source/misc/scopeguard.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/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx index 622cfff4989d..bc264bf87569 100644 --- a/comphelper/source/misc/sequence.cxx +++ b/comphelper/source/misc/sequence.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,13 +93,13 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString // ----------------------------------------------------------------------------- sal_Bool existsValue(const ::rtl::OUString& Value,const staruno::Sequence< ::rtl::OUString >& _aList) { - const ::rtl::OUString * pIter = _aList.getConstArray(); - const ::rtl::OUString * pEnd = pIter + _aList.getLength(); + const ::rtl::OUString * pIter = _aList.getConstArray(); + const ::rtl::OUString * pEnd = pIter + _aList.getLength(); return ::std::find(pIter,pEnd,Value) != pEnd; } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index c1b9cd9463b4..ea583797ee2a 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.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 @@ -124,7 +124,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS { sal_Int32 c = lSource.getLength(); sal_Int32 i = 0; - + for (i=0; i<c; ++i) { css::beans::PropertyValue lP; @@ -137,10 +137,10 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS throw css::beans::IllegalTypeException( ::rtl::OUString::createFromAscii("PropertyValue struct contains no usefull informations."), css::uno::Reference< css::uno::XInterface >()); - (*this)[lP.Name] = lP.Value; + (*this)[lP.Name] = lP.Value; continue; } - + css::beans::NamedValue lN; if (lSource[i] >>= lN) { @@ -151,12 +151,12 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS throw css::beans::IllegalTypeException( ::rtl::OUString::createFromAscii("NamedValue struct contains no usefull informations."), css::uno::Reference< css::uno::XInterface >()); - (*this)[lN.Name] = lN.Value; + (*this)[lN.Name] = lN.Value; continue; } // ignore VOID Any ... but reject wrong filled ones! - if (lSource[i].hasValue()) + if (lSource[i].hasValue()) throw css::beans::IllegalTypeException( ::rtl::OUString::createFromAscii("Any contains wrong type."), css::uno::Reference< css::uno::XInterface >()); @@ -272,7 +272,7 @@ const css::uno::Sequence< css::uno::Any > SequenceAsHashMap::getAsConstAnyList(: aProp.Value = pThis->second; pDestination[i] = css::uno::makeAny(aProp); } - + ++i; } @@ -312,10 +312,10 @@ sal_Bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const const ::rtl::OUString& sCheckName = pCheck->first; const css::uno::Any& aCheckValue = pCheck->second; const_iterator pFound = find(sCheckName); - + if (pFound == end()) return sal_False; - + const css::uno::Any& aFoundValue = pFound->second; if (aFoundValue != aCheckValue) return sal_False; @@ -336,7 +336,7 @@ void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate) { const ::rtl::OUString& sName = pUpdate->first; const css::uno::Any& aValue = pUpdate->second; - + (*this)[sName] = aValue; } } diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 92e3b3ef7e44..85bb01e7d15c 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ class ServiceDecl::Factory : public: explicit Factory( ServiceDecl const& rServiceDecl ) : m_rServiceDecl(rServiceDecl) {} - + // XServiceInfo: virtual rtl::OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); @@ -68,7 +68,7 @@ public: uno::Sequence<uno::Any> const& args, uno::Reference<uno::XComponentContext> const& xContext ) throw (uno::Exception); - + private: virtual ~Factory(); @@ -128,7 +128,7 @@ bool ServiceDecl::writeInfo( registry::XRegistryKey * xKey ) const try { uno::Reference<registry::XRegistryKey> const xNewKey( xKey->createKey( buf.makeStringAndClear() ) ); - + rtl::OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { @@ -138,7 +138,7 @@ bool ServiceDecl::writeInfo( registry::XRegistryKey * xKey ) const RTL_TEXTENCODING_ASCII_US ) ); } while (nIndex >= 0); - + bRet = true; } catch (registry::InvalidRegistryException const&) { @@ -161,8 +161,8 @@ void * ServiceDecl::getFactory( sal_Char const* pImplName ) const uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const { std::vector<rtl::OUString> vec; - - rtl::OString const str(m_pServiceNames); + + rtl::OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) ); @@ -170,7 +170,7 @@ uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const RTL_TEXTENCODING_ASCII_US ) ); } while (nIndex >= 0); - + return comphelper::containerToSequence(vec); } diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 1124146b39f6..90f62ba8deab 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/comphelper/source/misc/sharedmutex.cxx b/comphelper/source/misc/sharedmutex.cxx index 346fead794fe..ab7d68be12d3 100644 --- a/comphelper/source/misc/sharedmutex.cxx +++ b/comphelper/source/misc/sharedmutex.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index f51353e47897..4ae3422fe869 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.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 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference< aInterceptedRequest.Continuation = ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0)); aInterceptedRequest.MatchExact = sal_False; lInterceptions.push_back(aInterceptedRequest); - + setInterceptedHandler(xHandler); setInterceptions(lInterceptions); } diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 1503e08bf6b0..98258b8f615e 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.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/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 61e0eff9e0d7..41b0dde2a582 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.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/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx index ad7c83c8bb15..ca6362a6754b 100644 --- a/comphelper/source/misc/synchronousdispatch.cxx +++ b/comphelper/source/misc/synchronousdispatch.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 @@ -98,7 +98,7 @@ uno::Reference< lang::XComponent > SynchronousDispatch::dispatch( } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index 713e03caf23e..9be20ac52296 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ float getFloat(const Any& _rAny) } //------------------------------------------------------------------------------ -::rtl::OUString getString(const Any& _rAny) +::rtl::OUString getString(const Any& _rAny) { ::rtl::OUString nReturn; OSL_VERIFY( _rAny >>= nReturn ); @@ -142,7 +142,7 @@ sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException) } //------------------------------------------------------------------------------ -FontDescriptor getDefaultFont() +FontDescriptor getDefaultFont() { FontDescriptor aReturn; aReturn.Slant = FontSlant_DONTKNOW; @@ -203,8 +203,8 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) reinterpret_cast<const Any*>(pData)->getValue(), _rValue); } - else if ( (_rType.getTypeClass() == TypeClass_VOID) - || (_rValue.getValueType().getTypeClass() == TypeClass_VOID) + else if ( (_rType.getTypeClass() == TypeClass_VOID) + || (_rValue.getValueType().getTypeClass() == TypeClass_VOID) ) { bRes = _rType.getTypeClass() == _rValue.getValueType().getTypeClass(); @@ -431,7 +431,7 @@ sal_Bool compare(const Any& rLeft, const Any& rRight) } //------------------------------------------------------------------------- -sal_Bool operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight) +sal_Bool operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight) { return ( _rLeft.Name.equals( _rRight.Name ) ) && ( _rLeft.Height == _rRight.Height ) && @@ -454,14 +454,14 @@ sal_Bool operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRi //------------------------------------------------------------------------- Type getSequenceElementType(const Type& _rSequenceType) { - OSL_ENSURE(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE, + OSL_ENSURE(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE, "getSequenceElementType: must be called with a sequence type!"); if (!(_rSequenceType.getTypeClass() == TypeClass_SEQUENCE)) return Type(); TypeDescription aTD(_rSequenceType); - typelib_IndirectTypeDescription* pSequenceTD = + typelib_IndirectTypeDescription* pSequenceTD = reinterpret_cast< typelib_IndirectTypeDescription* >(aTD.get()); OSL_ASSERT(pSequenceTD); @@ -473,7 +473,7 @@ Type getSequenceElementType(const Type& _rSequenceType) return Type(); } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx index 1ddf413fc009..6c5a147bb0fb 100644 --- a/comphelper/source/misc/uieventslogger.cxx +++ b/comphelper/source/misc/uieventslogger.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 @@ -528,7 +528,7 @@ namespace comphelper { Reference<XMultiServiceFactory> sm = getProcessServiceFactory(); - // getting the Core Uno proxy object + // getting the Core Uno proxy object // It will call disposing and make sure we clear all our references { Reference<XTerminateListener> xCore( @@ -587,7 +587,7 @@ namespace comphelper m_Active = false; } - // private static UiEventsLogger_Impl + // private static UiEventsLogger_Impl bool UiEventsLogger_Impl::shouldActivate() { return getEnabledFromCfg() && getEnabledFromCoreController(); diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx index 247554495815..51a7ef3be0c0 100644 --- a/comphelper/source/misc/weak.cxx +++ b/comphelper/source/misc/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 @@ -45,7 +45,7 @@ OWeakTypeObject::~OWeakTypeObject() { } -Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (RuntimeException) +Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (RuntimeException) { if( rType == XTypeProvider::static_type() ) return Any( Reference< XTypeProvider >(this) ); @@ -53,12 +53,12 @@ Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (Runti return ::cppu::OWeakObject::queryInterface( rType ); } -void SAL_CALL OWeakTypeObject::acquire() throw () +void SAL_CALL OWeakTypeObject::acquire() throw () { ::cppu::OWeakObject::acquire(); } -void SAL_CALL OWeakTypeObject::release() throw () +void SAL_CALL OWeakTypeObject::release() throw () { ::cppu::OWeakObject::release(); } diff --git a/comphelper/source/misc/weakeventlistener.cxx b/comphelper/source/misc/weakeventlistener.cxx index 333727e47a45..a02edf3d8881 100644 --- a/comphelper/source/misc/weakeventlistener.cxx +++ b/comphelper/source/misc/weakeventlistener.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 @@ -88,7 +88,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 719ca340becd..9604a6832617 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.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/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index 5139a70e9a30..42e2a8584d90 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.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/comphelper/source/processfactory/componentfactory.cxx b/comphelper/source/processfactory/componentfactory.cxx index ec72a25dc615..f2dd88d0af52 100644 --- a/comphelper/source/processfactory/componentfactory.cxx +++ b/comphelper/source/processfactory/componentfactory.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 @@ -78,6 +78,6 @@ Reference< XSingleServiceFactory > loadLibComponentFactory( rLibName, OUString(), rImplName, xSF, xKey ), UNO_QUERY ); } -} // namespace comphelper +} // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/processfactory/processfactory.cxx b/comphelper/source/processfactory/processfactory.cxx index f9b2218f7018..8ec425295965 100644 --- a/comphelper/source/processfactory/processfactory.cxx +++ b/comphelper/source/processfactory/processfactory.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/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index a8329919502d..6d0fc4fc7fd1 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,13 +50,13 @@ ChainablePropertySet::ChainablePropertySet( comphelper::ChainablePropertySetInfo { } -ChainablePropertySet::~ChainablePropertySet() +ChainablePropertySet::~ChainablePropertySet() throw() { } // XPropertySet -Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo( ) +Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo( ) throw(RuntimeException) { return mxInfo; @@ -74,7 +74,7 @@ void ChainablePropertySet::unlockMutex() mpMutex->release(); } -void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue ) +void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -92,7 +92,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr _postSetValues(); } -Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -113,32 +113,32 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro return aAny; } -void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } // XMultiPropertySet -void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) +void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -172,7 +172,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU } } -Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) +Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) throw(RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -206,26 +206,26 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence return aValues; } -void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) +void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } // XPropertyState -PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUString& PropertyName ) +PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); @@ -241,7 +241,7 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUSt return aState; } -Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames ) +Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames ) throw(UnknownPropertyException, RuntimeException) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -267,7 +267,7 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons return aStates; } -void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) +void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -277,7 +277,7 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& _setPropertyToDefault( *((*aIter).second) ); } -Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -293,7 +293,7 @@ void ChainablePropertySet::_preGetPropertyState () OSL_ENSURE( sal_False, "you have to implement this yourself!"); } -void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& ) +void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& ) throw(UnknownPropertyException ) { OSL_ENSURE( sal_False, "you have to implement this yourself!"); @@ -305,13 +305,13 @@ void ChainablePropertySet::_postGetPropertyState () OSL_ENSURE( sal_False, "you have to implement this yourself!"); } -void ChainablePropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& ) +void ChainablePropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& ) throw(UnknownPropertyException ) { OSL_ENSURE( sal_False, "you have to implement this yourself!"); } -Any ChainablePropertySet::_getPropertyDefault( const comphelper::PropertyInfo& ) +Any ChainablePropertySet::_getPropertyDefault( const comphelper::PropertyInfo& ) throw(UnknownPropertyException, WrappedTargetException ) { OSL_ENSURE( sal_False, "you have to implement this yourself!"); diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index c8962e755013..acfec2f39119 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.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 @@ -45,28 +45,28 @@ using ::com::sun::star::beans::Property; using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::beans::UnknownPropertyException; -ChainablePropertySetInfo::ChainablePropertySetInfo() +ChainablePropertySetInfo::ChainablePropertySetInfo() throw() { } -ChainablePropertySetInfo::ChainablePropertySetInfo( PropertyInfo* pMap ) +ChainablePropertySetInfo::ChainablePropertySetInfo( PropertyInfo* pMap ) throw() { add ( pMap ); } -ChainablePropertySetInfo::~ChainablePropertySetInfo() +ChainablePropertySetInfo::~ChainablePropertySetInfo() throw() { } -void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount ) +void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount ) throw() { - // nCount < 0 => add all - // nCount == 0 => add nothing - // nCount > 0 => add at most nCount entries + // nCount < 0 => add all + // nCount == 0 => add nothing + // nCount > 0 => add at most nCount entries if( maProperties.getLength() ) maProperties.realloc( 0 ); @@ -83,7 +83,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount ) } } -void ChainablePropertySetInfo::remove( const rtl::OUString& aName ) +void ChainablePropertySetInfo::remove( const rtl::OUString& aName ) throw() { maMap.erase ( aName ); @@ -91,7 +91,7 @@ void ChainablePropertySetInfo::remove( const rtl::OUString& aName ) maProperties.realloc( 0 ); } -Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() +Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() throw(::com::sun::star::uno::RuntimeException) { sal_Int32 nSize = maMap.size(); @@ -117,7 +117,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() return maProperties; } -Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) +Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { PropertyInfoHash::iterator aIter = maMap.find( rName ); @@ -136,7 +136,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUSt return aProperty; } -sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) +sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() ); diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index fd5ec0fe7355..644c6b21de9b 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.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 @@ -45,18 +45,18 @@ using ::com::sun::star::beans::Property; using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::beans::UnknownPropertyException; -MasterPropertySetInfo::MasterPropertySetInfo() +MasterPropertySetInfo::MasterPropertySetInfo() throw() { } -MasterPropertySetInfo::MasterPropertySetInfo( PropertyInfo* pMap ) +MasterPropertySetInfo::MasterPropertySetInfo( PropertyInfo* pMap ) throw() { add ( pMap ); } -MasterPropertySetInfo::~MasterPropertySetInfo() +MasterPropertySetInfo::~MasterPropertySetInfo() throw() { PropertyDataHash::iterator aEnd = maMap.end(), aIter = maMap.begin(); @@ -67,12 +67,12 @@ MasterPropertySetInfo::~MasterPropertySetInfo() } } -void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8 nMapId ) +void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8 nMapId ) throw() { - // nCount < 0 => add all - // nCount == 0 => add nothing - // nCount > 0 => add at most nCount entries + // nCount < 0 => add all + // nCount == 0 => add nothing + // nCount > 0 => add at most nCount entries if( maProperties.getLength() ) maProperties.realloc( 0 ); @@ -89,7 +89,7 @@ void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8 } } -void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) +void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) throw() { if( maProperties.getLength() ) @@ -108,7 +108,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) } } -void MasterPropertySetInfo::remove( const rtl::OUString& aName ) +void MasterPropertySetInfo::remove( const rtl::OUString& aName ) throw() { maMap.erase ( aName ); @@ -116,7 +116,7 @@ void MasterPropertySetInfo::remove( const rtl::OUString& aName ) maProperties.realloc( 0 ); } -Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() +Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() throw(::com::sun::star::uno::RuntimeException) { sal_Int32 nSize = maMap.size(); @@ -142,7 +142,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() return maProperties; } -Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) +Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { PropertyDataHash::iterator aIter = maMap.find( rName ); @@ -157,12 +157,12 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUStrin const Type* pType; GenerateCppuType ( pInfo->meCppuType, pType ); aProperty.Type = *pType; - + aProperty.Attributes = pInfo->mnAttributes; return aProperty; } -sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) +sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() ); diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx index c3d4d5248c15..29932eae0a26 100644 --- a/comphelper/source/property/TypeGeneration.cxx +++ b/comphelper/source/property/TypeGeneration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,65 +149,65 @@ namespace comphelper { switch( eType ) { - case CPPUTYPE_BOOLEAN: pType = &::getBooleanCppuType(); break; - case CPPUTYPE_INT8: pType = &::getCppuType( (sal_Int8*)0 ); break; - case CPPUTYPE_INT16: pType = &::getCppuType( (sal_Int16*)0 ); break; - case CPPUTYPE_INT32: pType = &::getCppuType( (sal_Int32*)0 ); break; + case CPPUTYPE_BOOLEAN: pType = &::getBooleanCppuType(); break; + case CPPUTYPE_INT8: pType = &::getCppuType( (sal_Int8*)0 ); break; + case CPPUTYPE_INT16: pType = &::getCppuType( (sal_Int16*)0 ); break; + case CPPUTYPE_INT32: pType = &::getCppuType( (sal_Int32*)0 ); break; - case CPPUTYPE_DOUBLE: pType = &::getCppuType( (double*)0 ); break; - case CPPUTYPE_FLOAT: pType = &::getCppuType( (float*)0 ); break; - case CPPUTYPE_OUSTRING: pType = &::getCppuType( (OUString*)0 ); break; - case CPPUTYPE_FONTSLANT: pType = &::getCppuType( (FontSlant*)0 ); break; - case CPPUTYPE_LOCALE: pType = &::getCppuType( (Locale*)0 ); break; - case CPPUTYPE_PROPERTYVALUE:pType = &::getCppuType( (Sequence<PropertyValue>*)0 ); break; - case CPPUTYPE_PROPERTYVALUES: pType = &::getCppuType( (Sequence<PropertyValues>*)0 ); break; - case CPPUTYPE_BORDERLINE: pType = &::getCppuType( (table::BorderLine*)0 ); break; - case CPPUTYPE_BREAK: pType = &::getCppuType( (style::BreakType*)0 ); break; - case CPPUTYPE_GRAPHICLOC: pType = &::getCppuType( (style::GraphicLocation*)0 ); break; - case CPPUTYPE_DROPCAPFMT: pType = &::getCppuType( (style::DropCapFormat*)0 ); break; - case CPPUTYPE_LINESPACE: pType = &::getCppuType( (style::LineSpacing*)0 ); break; + case CPPUTYPE_DOUBLE: pType = &::getCppuType( (double*)0 ); break; + case CPPUTYPE_FLOAT: pType = &::getCppuType( (float*)0 ); break; + case CPPUTYPE_OUSTRING: pType = &::getCppuType( (OUString*)0 ); break; + case CPPUTYPE_FONTSLANT: pType = &::getCppuType( (FontSlant*)0 ); break; + case CPPUTYPE_LOCALE: pType = &::getCppuType( (Locale*)0 ); break; + case CPPUTYPE_PROPERTYVALUE:pType = &::getCppuType( (Sequence<PropertyValue>*)0 ); break; + case CPPUTYPE_PROPERTYVALUES: pType = &::getCppuType( (Sequence<PropertyValues>*)0 ); break; + case CPPUTYPE_BORDERLINE: pType = &::getCppuType( (table::BorderLine*)0 ); break; + case CPPUTYPE_BREAK: pType = &::getCppuType( (style::BreakType*)0 ); break; + case CPPUTYPE_GRAPHICLOC: pType = &::getCppuType( (style::GraphicLocation*)0 ); break; + case CPPUTYPE_DROPCAPFMT: pType = &::getCppuType( (style::DropCapFormat*)0 ); break; + case CPPUTYPE_LINESPACE: pType = &::getCppuType( (style::LineSpacing*)0 ); break; - case CPPUTYPE_AWTSIZE: pType = &::getCppuType( (awt::Size*)0 ); break; - case CPPUTYPE_SHADOWFMT: pType = &::getCppuType( (table::ShadowFormat*)0 ); break; - case CPPUTYPE_TBLCOLSEP: pType = &::getCppuType( (Sequence<text::TableColumnSeparator>*)0 ); break; - case CPPUTYPE_PNTSEQSEQ: pType = &::getCppuType( (PointSequenceSequence*)0 ); break; - case CPPUTYPE_DOCIDXMRK: pType = &::getCppuType( (Sequence< Reference< XDocumentIndexMark > >*)0 ); break; - case CPPUTYPE_SEQINT8: pType = &::getCppuType( (Sequence<sal_Int8>*)0 ); break; - case CPPUTYPE_SEQTABSTOP: pType = &::getCppuType( (Sequence<style::TabStop>*)0 ); break; + case CPPUTYPE_AWTSIZE: pType = &::getCppuType( (awt::Size*)0 ); break; + case CPPUTYPE_SHADOWFMT: pType = &::getCppuType( (table::ShadowFormat*)0 ); break; + case CPPUTYPE_TBLCOLSEP: pType = &::getCppuType( (Sequence<text::TableColumnSeparator>*)0 ); break; + case CPPUTYPE_PNTSEQSEQ: pType = &::getCppuType( (PointSequenceSequence*)0 ); break; + case CPPUTYPE_DOCIDXMRK: pType = &::getCppuType( (Sequence< Reference< XDocumentIndexMark > >*)0 ); break; + case CPPUTYPE_SEQINT8: pType = &::getCppuType( (Sequence<sal_Int8>*)0 ); break; + case CPPUTYPE_SEQTABSTOP: pType = &::getCppuType( (Sequence<style::TabStop>*)0 ); break; case CPPUTYPE_SEQANCHORTYPE:pType = &::getCppuType( (Sequence<text::TextContentAnchorType>*)0 ); break; - case CPPUTYPE_SEQDEPTXTFLD: pType = &::getCppuType( (Sequence<Reference<XDependentTextField> >*)0); break; - case CPPUTYPE_TXTCNTANCHOR: pType = &::getCppuType( (text::TextContentAnchorType*)0 ); break; - case CPPUTYPE_WRAPTXTMODE: pType = &::getCppuType( (text::WrapTextMode*)0 ); break; + case CPPUTYPE_SEQDEPTXTFLD: pType = &::getCppuType( (Sequence<Reference<XDependentTextField> >*)0); break; + case CPPUTYPE_TXTCNTANCHOR: pType = &::getCppuType( (text::TextContentAnchorType*)0 ); break; + case CPPUTYPE_WRAPTXTMODE: pType = &::getCppuType( (text::WrapTextMode*)0 ); break; - case CPPUTYPE_COLORMODE: pType = &::getCppuType( (drawing::ColorMode*)0 ); break; - case CPPUTYPE_PAGESTYLELAY: pType = &::getCppuType( (style::PageStyleLayout*)0 ); break; - case CPPUTYPE_VERTALIGN: pType = &::getCppuType( (style::VerticalAlignment*)0 ); break; - case CPPUTYPE_TABLEBORDER: pType = &::getCppuType( (table::TableBorder*)0 ); break; - case CPPUTYPE_GRFCROP: pType = &::getCppuType( (text::GraphicCrop*)0 ); break; - case CPPUTYPE_SECTFILELNK: pType = &::getCppuType( (text::SectionFileLink*)0 ); break; - case CPPUTYPE_PAGENUMTYPE: pType = &::getCppuType( (text::PageNumberType*)0); break; - case CPPUTYPE_DATETIME: pType = &::getCppuType( (util::DateTime*)0 ); break; - case CPPUTYPE_DATE: pType = &::getCppuType( (util::Date*)0 ); break; + case CPPUTYPE_COLORMODE: pType = &::getCppuType( (drawing::ColorMode*)0 ); break; + case CPPUTYPE_PAGESTYLELAY: pType = &::getCppuType( (style::PageStyleLayout*)0 ); break; + case CPPUTYPE_VERTALIGN: pType = &::getCppuType( (style::VerticalAlignment*)0 ); break; + case CPPUTYPE_TABLEBORDER: pType = &::getCppuType( (table::TableBorder*)0 ); break; + case CPPUTYPE_GRFCROP: pType = &::getCppuType( (text::GraphicCrop*)0 ); break; + case CPPUTYPE_SECTFILELNK: pType = &::getCppuType( (text::SectionFileLink*)0 ); break; + case CPPUTYPE_PAGENUMTYPE: pType = &::getCppuType( (text::PageNumberType*)0); break; + case CPPUTYPE_DATETIME: pType = &::getCppuType( (util::DateTime*)0 ); break; + case CPPUTYPE_DATE: pType = &::getCppuType( (util::Date*)0 ); break; - case CPPUTYPE_REFINTERFACE: pType = &::getCppuType( (Reference<XInterface>*)0 ); break; - case CPPUTYPE_REFIDXREPL: pType = &::getCppuType( (Reference<container::XIndexReplace>*)0 ); break; - case CPPUTYPE_REFNAMECNT: pType = &::getCppuType( (Reference<container::XNameContainer>*)0 ); break; - case CPPUTYPE_REFTEXTFRAME: pType = &::getCppuType( (Reference<text::XTextFrame>*)0 ); break; - case CPPUTYPE_REFTEXTSECTION: pType = &::getCppuType( (Reference<text::XTextSection>*)0 ); break; - case CPPUTYPE_REFFOOTNOTE: pType = &::getCppuType( (Reference<text::XFootnote>*)0 ); break; - case CPPUTYPE_REFTEXT: pType = &::getCppuType( (Reference<text::XText>*)0 ); break; - case CPPUTYPE_REFTEXTCOL: pType = &::getCppuType( (Reference<text::XTextColumns>*)0 ); break; - case CPPUTYPE_REFFORBCHARS: pType = &::getCppuType( (Reference<XForbiddenCharacters>*)0 ); break; - case CPPUTYPE_REFIDXCNTNR: pType = &::getCppuType( (Reference<XIndexContainer>*)0 ); break; - case CPPUTYPE_REFTEXTCNTNT: pType = &::getCppuType( (Reference<XTextContent>*)0 ); break; - case CPPUTYPE_REFBITMAP: pType = &::getCppuType( (Reference<awt::XBitmap>*)0 ); break; - case CPPUTYPE_REFNMREPLACE: pType = &::getCppuType( (Reference<container::XNameReplace>*)0 ); break; - case CPPUTYPE_REFCELL: pType = &::getCppuType( (Reference<table::XCell>*)0 ); break; - case CPPUTYPE_REFDOCINDEX: pType = &::getCppuType( (Reference<text::XDocumentIndex>*)0 ); break; - case CPPUTYPE_REFDOCIDXMRK: pType = &::getCppuType( (Reference<text::XDocumentIndexMark>*)0 ); break; - case CPPUTYPE_REFTXTFIELD: pType = &::getCppuType( (Reference<text::XTextField>*)0 ); break; - case CPPUTYPE_REFTXTRANGE: pType = &::getCppuType( (Reference<text::XTextRange>*)0 ); break; - case CPPUTYPE_REFTXTTABLE: pType = &::getCppuType( (Reference<text::XTextTable>*)0 ); break; + case CPPUTYPE_REFINTERFACE: pType = &::getCppuType( (Reference<XInterface>*)0 ); break; + case CPPUTYPE_REFIDXREPL: pType = &::getCppuType( (Reference<container::XIndexReplace>*)0 ); break; + case CPPUTYPE_REFNAMECNT: pType = &::getCppuType( (Reference<container::XNameContainer>*)0 ); break; + case CPPUTYPE_REFTEXTFRAME: pType = &::getCppuType( (Reference<text::XTextFrame>*)0 ); break; + case CPPUTYPE_REFTEXTSECTION: pType = &::getCppuType( (Reference<text::XTextSection>*)0 ); break; + case CPPUTYPE_REFFOOTNOTE: pType = &::getCppuType( (Reference<text::XFootnote>*)0 ); break; + case CPPUTYPE_REFTEXT: pType = &::getCppuType( (Reference<text::XText>*)0 ); break; + case CPPUTYPE_REFTEXTCOL: pType = &::getCppuType( (Reference<text::XTextColumns>*)0 ); break; + case CPPUTYPE_REFFORBCHARS: pType = &::getCppuType( (Reference<XForbiddenCharacters>*)0 ); break; + case CPPUTYPE_REFIDXCNTNR: pType = &::getCppuType( (Reference<XIndexContainer>*)0 ); break; + case CPPUTYPE_REFTEXTCNTNT: pType = &::getCppuType( (Reference<XTextContent>*)0 ); break; + case CPPUTYPE_REFBITMAP: pType = &::getCppuType( (Reference<awt::XBitmap>*)0 ); break; + case CPPUTYPE_REFNMREPLACE: pType = &::getCppuType( (Reference<container::XNameReplace>*)0 ); break; + case CPPUTYPE_REFCELL: pType = &::getCppuType( (Reference<table::XCell>*)0 ); break; + case CPPUTYPE_REFDOCINDEX: pType = &::getCppuType( (Reference<text::XDocumentIndex>*)0 ); break; + case CPPUTYPE_REFDOCIDXMRK: pType = &::getCppuType( (Reference<text::XDocumentIndexMark>*)0 ); break; + case CPPUTYPE_REFTXTFIELD: pType = &::getCppuType( (Reference<text::XTextField>*)0 ); break; + case CPPUTYPE_REFTXTRANGE: pType = &::getCppuType( (Reference<text::XTextRange>*)0 ); break; + case CPPUTYPE_REFTXTTABLE: pType = &::getCppuType( (Reference<text::XTextTable>*)0 ); break; case CPPUTYPE_AWTPOINT: pType = &::getCppuType( (awt::Point*)0 ); break; case CPPUTYPE_REFLIBCONTAINER: pType = &::getCppuType( (Reference< script::XLibraryContainer >*)0); break; case CPPUTYPE_OUSTRINGS: pType = &::getCppuType( (Sequence< ::rtl::OUString >*)0); break; diff --git a/comphelper/source/property/composedprops.cxx b/comphelper/source/property/composedprops.cxx index 74d1b23891f9..cf47b049ef36 100644 --- a/comphelper/source/property/composedprops.cxx +++ b/comphelper/source/property/composedprops.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,7 +48,7 @@ namespace comphelper class OComposedPropertySetInfo : public ::cppu::WeakImplHelper1< XPropertySetInfo > { private: - Sequence< Property> m_aProperties; + Sequence< Property> m_aProperties; public: OComposedPropertySetInfo(const Sequence< Property>& _rProperties); @@ -100,7 +100,7 @@ namespace comphelper if (xMasterSet.is()) aMasterProps = xMasterSet->getPropertySetInfo()->getProperties(); sal_Int32 nMasterPropsCount = aMasterProps.getLength(); - const Property* pMasterProps = aMasterProps.getConstArray(); + const Property* pMasterProps = aMasterProps.getConstArray(); // check which of the master properties should be included Sequence<sal_Bool> aInclusionFlags(nMasterPropsCount); @@ -129,7 +129,7 @@ namespace comphelper xSecondarySet = m_aSingleSets[i]; aSecondaryProperties = xSecondarySet->getPropertySetInfo()->getProperties(); nSecondaryPropertyCount = aSecondaryProperties.getLength(); - const Property* pSecondaryProperties = aSecondaryProperties.getConstArray(); + const Property* pSecondaryProperties = aSecondaryProperties.getConstArray(); // search the current primary property in the secondary property sequence sal_Int32 k=0; @@ -147,7 +147,7 @@ namespace comphelper sal_Int32 nOverallProperties = 0; for (sal_Int32 nCounter=0; nCounter<nMasterPropsCount; ++nCounter) { - if (pInclusionFlags[nCounter]) + if (pInclusionFlags[nCounter]) ++nOverallProperties; } @@ -201,19 +201,19 @@ namespace comphelper PropertyState eSecondaryState; for (sal_Int32 i=1; i<nSingleSets; ++i) { - Reference< XPropertySet > xSecondary(m_aSingleSets[i]); - Reference< XPropertyState > xSecondaryState(xSecondary, UNO_QUERY); + Reference< XPropertySet > xSecondary(m_aSingleSets[i]); + Reference< XPropertyState > xSecondaryState(xSecondary, UNO_QUERY); // the secondary state eSecondaryState = PropertyState_DIRECT_VALUE; - if(xSecondaryState.is()) + if(xSecondaryState.is()) eSecondaryState = xSecondaryState->getPropertyState(_rPropertyName); // the secondary value Any aSecondaryValue(xSecondary->getPropertyValue(_rPropertyName)); - if ( (PropertyState_AMBIGUOUS_VALUE == eSecondaryState) // secondary is ambiguous - || !::comphelper::compare(aPrimaryValue, aSecondaryValue) // unequal values + if ( (PropertyState_AMBIGUOUS_VALUE == eSecondaryState) // secondary is ambiguous + || !::comphelper::compare(aPrimaryValue, aSecondaryValue) // unequal values ) { eState = PropertyState_AMBIGUOUS_VALUE; @@ -247,7 +247,7 @@ namespace comphelper sal_Int32 nSingleSets = m_aSingleSets.size(); for (sal_Int32 i=0; i<nSingleSets; ++i) { - Reference< XPropertyState > xState(m_aSingleSets[i], UNO_QUERY); + Reference< XPropertyState > xState(m_aSingleSets[i], UNO_QUERY); if(xState.is()) xState->setPropertyToDefault(_rPropertyName); } @@ -325,7 +325,7 @@ namespace comphelper Property SAL_CALL OComposedPropertySetInfo::getPropertyByName( const ::rtl::OUString& _rName ) throw(UnknownPropertyException, RuntimeException) { sal_Int32 nLength = m_aProperties.getLength(); - const Property* pProps = m_aProperties.getConstArray(); + const Property* pProps = m_aProperties.getConstArray(); // TODO TODO TODO: this O(n) search really sucks ... for (sal_Int32 i=0; i<nLength; ++i, ++pProps) { @@ -340,11 +340,11 @@ namespace comphelper sal_Bool SAL_CALL OComposedPropertySetInfo::hasPropertyByName( const ::rtl::OUString& _rName ) throw(RuntimeException) { sal_Int32 nLength = m_aProperties.getLength(); - const Property* pProps = m_aProperties.getConstArray(); + const Property* pProps = m_aProperties.getConstArray(); // TODO TODO TODO: this O(n) search really sucks ... for( sal_Int32 i=0; i<nLength; ++i,++pProps ) { - if(pProps->Name == _rName) + if(pProps->Name == _rName) return sal_True; } @@ -352,7 +352,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 123e9ef2f784..6e4ccb72e6dd 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.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 @@ -63,14 +63,14 @@ namespace comphelper Mutex maMutex ; } ; - class GenericPropertySet : public OWeakAggObject, + class GenericPropertySet : public OWeakAggObject, public XServiceInfo, public XTypeProvider, public PropertySetHelper, private IMPL_GenericPropertySet_MutexContainer { private: - GenericAnyMapImpl maAnyMap; + GenericAnyMapImpl maAnyMap; ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString,UStringHash,UStringEqual> m_aListener; protected: diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 4adc7bc4e46b..a93318ffdc06 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.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 @@ -228,7 +228,7 @@ namespace comphelper // So, everything of XSet except insert is implemented empty return sal_False; } - + //-------------------------------------------------------------------- void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException) { @@ -247,7 +247,7 @@ namespace comphelper ) throw IllegalTypeException( ::rtl::OUString(), *this ); - m_aDynamicProperties.addVoidProperty( aProperty.Name, aProperty.Type, findFreeHandle(), aProperty.Attributes ); + m_aDynamicProperties.addVoidProperty( aProperty.Name, aProperty.Type, findFreeHandle(), aProperty.Attributes ); // our property info is dirty m_pArrayHelper.reset(); @@ -255,7 +255,7 @@ namespace comphelper g.clear(); setModified(sal_True); } - + //-------------------------------------------------------------------- void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) { @@ -356,7 +356,7 @@ namespace comphelper ) throw IllegalTypeException( ::rtl::OUString(), *this ); - m_aDynamicProperties.addProperty( _rName, findFreeHandle(), _nAttributes, _rInitialValue ); + m_aDynamicProperties.addProperty( _rName, findFreeHandle(), _nAttributes, _rInitialValue ); // our property info is dirty m_pArrayHelper.reset(); diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 6d0a6e1f4f54..ce8fb299e6ba 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.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/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index ff3dd8ec9976..496dce0df30a 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.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,8 +84,8 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( sal_Int32 nMergedProps = nDelegatorProps + nAggregateProps; m_aProperties.realloc( nMergedProps ); - const Property* pAggregateProps = _rAggProperties.getConstArray(); - const Property* pDelegateProps = _rProperties.getConstArray(); + const Property* pAggregateProps = _rAggProperties.getConstArray(); + const Property* pDelegateProps = _rProperties.getConstArray(); Property* pMergedProps = m_aProperties.getArray(); // create the map for the delegator properties @@ -111,11 +111,11 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( // no handle from the info service -> default nHandle = nAggregateHandle++; else - { // check if we alread have a property with the given handle + { // check if we alread have a property with the given handle const Property* pPropsTilNow = m_aProperties.getConstArray(); for ( sal_Int32 nCheck = 0; nCheck < nMPLoop; ++nCheck, ++pPropsTilNow ) if ( pPropsTilNow->Handle == nHandle ) - { // conflicts -> use another one (which we don't check anymore, assuming _nFirstAggregateId was large enough) + { // conflicts -> use another one (which we don't check anymore, assuming _nFirstAggregateId was large enough) nHandle = nAggregateHandle++; break; } @@ -125,7 +125,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( m_aPropertyAccessors[ nHandle ] = OPropertyAccessor( pMergedProps->Handle, nMPLoop, sal_True ); pMergedProps->Handle = nHandle; } - pMergedProps = m_aProperties.getArray(); // reset, needed again below + pMergedProps = m_aProperties.getArray(); // reset, needed again below // sortieren der Properties nach Namen ::std::sort( pMergedProps, pMergedProps+nMergedProps, PropertyCompareByName()); @@ -302,7 +302,7 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles( else { // binary search is better - sal_Int32 nCompVal = 1; + sal_Int32 nCompVal = 1; const ::com::sun::star::beans::Property* pOldEnd = pEnd--; const ::com::sun::star::beans::Property* pMid = pCur; @@ -518,7 +518,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun: { sal_Int32 nHandle = rPH.getHandleByName(pEvents->PropertyName); if ( ( nHandle != -1 ) && !isCurrentlyForwardingProperty( nHandle ) ) - { // same as above : -1 is valid (73247) ... + { // same as above : -1 is valid (73247) ... pHandles[nDest] = nHandle; pNewValues[nDest] = pEvents->NewValue; pOldValues[nDest] = pEvents->OldValue; @@ -559,10 +559,10 @@ void OPropertySetAggregationHelper::setAggregation(const ::com::sun::star::uno: m_bListening = sal_False; } - m_xAggregateState = m_xAggregateState.query( _rxDelegate ); - m_xAggregateSet = m_xAggregateSet.query( _rxDelegate ); - m_xAggregateMultiSet = m_xAggregateMultiSet.query( _rxDelegate ); - m_xAggregateFastSet = m_xAggregateFastSet.query( _rxDelegate ); + m_xAggregateState = m_xAggregateState.query( _rxDelegate ); + m_xAggregateSet = m_xAggregateSet.query( _rxDelegate ); + m_xAggregateMultiSet = m_xAggregateMultiSet.query( _rxDelegate ); + m_xAggregateFastSet = m_xAggregateFastSet.query( _rxDelegate ); // must support XPropertySet and XMultiPropertySet if ( m_xAggregateSet.is() && !m_xAggregateMultiSet.is() ) @@ -635,13 +635,13 @@ sal_Int32 OPropertySetAggregationHelper::getOriginalHandle(sal_Int32 nHandle) co //------------------------------------------------------------------------------ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, + 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) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); ::rtl::OUString aPropName; - sal_Int32 nOriginalHandle = -1; + sal_Int32 nOriginalHandle = -1; // does the handle belong to the aggregation ? if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, _nHandle)) @@ -658,7 +658,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: { OPropertyArrayAggregationHelper& rPH = (OPropertyArrayAggregationHelper&)const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper(); ::rtl::OUString aPropName; - sal_Int32 nOriginalHandle = -1; + sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { @@ -669,7 +669,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: } else if ( m_pForwarder->isResponsibleFor( nHandle ) ) { - // this is a property which has been "overwritten" in our instance (thus + // this is a property which has been "overwritten" in our instance (thus // fillAggregatePropertyInfoByHandle didn't find it) rValue = m_xAggregateSet->getPropertyValue( getPropertyName( nHandle ) ); } @@ -677,13 +677,13 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: //------------------------------------------------------------------------------ ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); ::rtl::OUString aPropName; - sal_Int32 nOriginalHandle = -1; + sal_Int32 nOriginalHandle = -1; ::com::sun::star::uno::Any aValue; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) @@ -753,7 +753,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( ++nAggCount; } - pNames = _rPropertyNames.getConstArray(); // reset, we'll need it again below ... + pNames = _rPropertyNames.getConstArray(); // reset, we'll need it again below ... // all properties belong to the aggregate if (nAggCount == nLen) @@ -769,7 +769,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( const ::com::sun::star::uno::Any* pValues = _rValues.getConstArray(); ::com::sun::star::uno::Any* pConvertedValues = NULL; ::com::sun::star::uno::Any* pOldValues = NULL; - sal_Int32* pHandles = NULL; + sal_Int32* pHandles = NULL; try { @@ -838,7 +838,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( pHandles[i], pDelValues[i] ) ) { // only increment if the property really change - pHandles[nHitCount] = pHandles[i]; + pHandles[nHitCount] = pHandles[i]; nHitCount++; } } @@ -900,7 +900,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( } ::rtl::OUString aPropName; - sal_Int32 nOriginalHandle = -1; + sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { if (m_xAggregateState.is()) @@ -924,7 +924,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O } ::rtl::OUString aPropName; - sal_Int32 nOriginalHandle = -1; + sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { if (m_xAggregateState.is()) @@ -956,7 +956,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O throw ::com::sun::star::beans::UnknownPropertyException(); ::rtl::OUString aPropName; - sal_Int32 nOriginalHandle = -1; + sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { if (m_xAggregateState.is()) @@ -1023,7 +1023,7 @@ bool OPropertySetAggregationHelper::isCurrentlyForwardingProperty( sal_Int32 _nH } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index a13930e34fba..e3838f5db9ad 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.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 @@ -148,15 +148,15 @@ sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>& { if (_rxSet.is()) { - // XPropertySetInfoRef xInfo(rxSet->getPropertySetInfo()); + // XPropertySetInfoRef xInfo(rxSet->getPropertySetInfo()); return _rxSet->getPropertySetInfo()->hasPropertyByName(_rName); } return sal_False; } //------------------------------------------------------------------ -bool findProperty(Property& o_rProp, - Sequence<Property>& i_seqProps, +bool findProperty(Property& o_rProp, + Sequence<Property>& i_seqProps, const ::rtl::OUString& i_rPropName) { const Property* pAry(i_seqProps.getConstArray()); diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx index 3170411de510..1487818a8875 100644 --- a/comphelper/source/property/propertybag.cxx +++ b/comphelper/source/property/propertybag.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 @@ -78,7 +78,7 @@ namespace comphelper { } - PropertyBag::~PropertyBag() + PropertyBag::~PropertyBag() { } diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index a826eca2bd92..e302d3338e9a 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.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 @@ -100,7 +100,7 @@ void OPropertyContainer::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 8f7b64d58452..7c3ac62d3202 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.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 @@ -211,7 +211,7 @@ namespace void OPropertyContainerHelper::implPushBackProperty(const PropertyDescription& _rProp) { #ifdef DBG_UTIL - for ( PropertiesIterator checkConflicts = m_aProperties.begin(); + for ( PropertiesIterator checkConflicts = m_aProperties.begin(); checkConflicts != m_aProperties.end(); ++checkConflicts ) @@ -278,10 +278,10 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( // (#102329# - 2002-08-14 - fs@openoffice.org) // (#i29490# - 2004-06-16 - fs@openoffice.org) if ( !aNewRequestedValue.getValueType().equals( aPos->aProperty.Type ) ) - { // the actually given value is not of the same type as the one required + { // the actually given value is not of the same type as the one required Any aProperlyTyped( NULL, aPos->aProperty.Type.getTypeLibType() ); - if ( uno_type_assignData( + if ( uno_type_assignData( const_cast< void* >( aProperlyTyped.getValue() ), aProperlyTyped.getValueType().getTypeLibType(), const_cast< void* >( aNewRequestedValue.getValue() ), aNewRequestedValue.getValueType().getTypeLibType(), reinterpret_cast< uno_QueryInterfaceFunc >( cpp_queryInterface ), @@ -297,8 +297,8 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( } // argument check - if ( ! ( (bMayBeVoid && !aNewRequestedValue.hasValue()) // void is allowed if the attribute says so - || (aNewRequestedValue.getValueType().equals(aPos->aProperty.Type)) // else the types have to be equal + if ( ! ( (bMayBeVoid && !aNewRequestedValue.hasValue()) // void is allowed if the attribute says so + || (aNewRequestedValue.getValueType().equals(aPos->aProperty.Type)) // else the types have to be equal ) ) { @@ -354,7 +354,7 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( aProperlyTyped = Any( NULL, aPos->aProperty.Type.getTypeLibType() ); // (need this as we do not want to overwrite the derived class member here) - if ( uno_type_assignData( + if ( uno_type_assignData( const_cast<void*>(aProperlyTyped.getValue()), aProperlyTyped.getValueType().getTypeLibType(), const_cast<void*>(_rValue.getValue()), _rValue.getValueType().getTypeLibType(), reinterpret_cast< uno_QueryInterfaceFunc >( cpp_queryInterface ), @@ -422,8 +422,8 @@ void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An #endif // copy the data from the to-be-set value uno_type_assignData( - aPos->aLocation.pDerivedClassMember, aPos->aProperty.Type.getTypeLibType(), - const_cast< void* >( _rValue.getValue() ), _rValue.getValueType().getTypeLibType(), + aPos->aLocation.pDerivedClassMember, aPos->aProperty.Type.getTypeLibType(), + const_cast< void* >( _rValue.getValue() ), _rValue.getValueType().getTypeLibType(), reinterpret_cast< uno_QueryInterfaceFunc >( cpp_queryInterface ), reinterpret_cast< uno_AcquireFunc >( cpp_acquire ), reinterpret_cast< uno_ReleaseFunc >( cpp_release ) ); @@ -517,7 +517,7 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) Sequence< Property > aOwnProps(m_aProperties.size()); Property* pOwnProps = aOwnProps.getArray(); - for ( ConstPropertiesIterator aLoop = m_aProperties.begin(); + for ( ConstPropertiesIterator aLoop = m_aProperties.begin(); aLoop != m_aProperties.end(); ++aLoop, ++pOwnProps ) @@ -536,10 +536,10 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) Sequence< Property > aOutput; aOutput.realloc(_rProps.getLength() + aOwnProps.getLength()); // do the merge - ::std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1 - aOwnProps.getConstArray(), aOwnProps.getConstArray() + aOwnProps.getLength(), // input 2 - aOutput.getArray(), // output - PropertyCompareByName() // compare operator + ::std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1 + aOwnProps.getConstArray(), aOwnProps.getConstArray() + aOwnProps.getLength(), // input 2 + aOutput.getArray(), // output + PropertyCompareByName() // compare operator ); // copy the output @@ -547,7 +547,7 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index 1a7455b8c956..41c40e11d924 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.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 @@ class PropertySetHelperImpl { public: PropertyMapEntry* find( const OUString& aName ) const throw(); - + PropertySetInfo* mpInfo; }; } @@ -170,7 +170,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUStr if( nCount ) { PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1]; - pEntries[nCount] = NULL; + pEntries[nCount] = NULL; const OUString* pNames = aPropertyNames.getConstArray(); sal_Bool bUnknown = sal_False; diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index 6642c0d4db55..e17d3d1b3a11 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.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 @@ -72,9 +72,9 @@ PropertyMapImpl::~PropertyMapImpl() throw() void PropertyMapImpl::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw() { - // nCount < 0 => add all - // nCount == 0 => add nothing - // nCount > 0 => add at most nCount entries + // nCount < 0 => add all + // nCount == 0 => add nothing + // nCount > 0 => add at most nCount entries while( pMap->mpName && ( ( nCount < 0) || ( nCount-- > 0 ) ) ) { diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index 833cf0f3da34..3a1ed18a0e7e 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.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 @@ -60,7 +60,7 @@ namespace comphelper //= OPropertyStateContainer //===================================================================== //--------------------------------------------------------------------- - OPropertyStateContainer::OPropertyStateContainer( ::cppu::OBroadcastHelper& _rBHelper ) + OPropertyStateContainer::OPropertyStateContainer( ::cppu::OBroadcastHelper& _rBHelper ) :OPropertyContainer( _rBHelper ) { } @@ -121,10 +121,10 @@ namespace comphelper PropertyState* pStates = aStates.getArray(); cppu::IPropertyArrayHelper& rHelper = getInfoHelper(); - Sequence< Property> aAllProperties = rHelper.getProperties(); - sal_Int32 nAllProperties = aAllProperties.getLength(); - const Property* pAllProperties = aAllProperties.getConstArray(); - const Property* pAllPropertiesEnd = pAllProperties + nAllProperties; + Sequence< Property> aAllProperties = rHelper.getProperties(); + sal_Int32 nAllProperties = aAllProperties.getLength(); + const Property* pAllProperties = aAllProperties.getConstArray(); + const Property* pAllPropertiesEnd = pAllProperties + nAllProperties; osl::MutexGuard aGuard( rBHelper.rMutex ); for ( ; ( pAllProperties != pAllPropertiesEnd ) && ( pLookup != pLookupEnd ); ++pAllProperties ) @@ -191,7 +191,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #ifdef FS_PRIV_DEBUG @@ -214,16 +214,16 @@ namespace comphelper //===================================================================== //= Test - compiler test //===================================================================== - typedef ::cppu::OWeakAggObject Test_RefCountBase; - class Test :public OMutexAndBroadcastHelper + typedef ::cppu::OWeakAggObject Test_RefCountBase; + class Test :public OMutexAndBroadcastHelper ,public OPropertyStateContainer ,public OPropertyArrayUsageHelper< Test > ,public Test_RefCountBase { private: - ::rtl::OUString m_sStringProperty; - Reference< XInterface > m_xInterfaceProperty; - Any m_aMayBeVoidProperty; + ::rtl::OUString m_sStringProperty; + Reference< XInterface > m_xInterfaceProperty; + Any m_aMayBeVoidProperty; protected: Test( ); @@ -333,7 +333,7 @@ namespace comphelper } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... #endif diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index a7e9c1e395d0..e9d3b2a152e9 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.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 @@ -146,7 +146,7 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSourc if (!locked()) m_pListener->_disposing(_rSource); // disconnect the listener - if (m_pListener) // may have been reset whilest calling into _disposing + if (m_pListener) // may have been reset whilest calling into _disposing m_pListener->setAdapter(NULL); } diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 5be6c842a5f8..313c881bff89 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.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 @@ -144,7 +144,7 @@ namespace comphelper ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aProps = rHelper.getProperties(); const ::com::sun::star::beans::Property* pProps = aProps.getConstArray(); - sal_Int32 nPropCount = aProps.getLength(); + sal_Int32 nPropCount = aProps.getLength(); osl::MutexGuard aGuard(rBHelper.rMutex); for (sal_Int32 i=0, j=0; i<nPropCount && j<nLen; ++i, ++pProps) diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx index 662c5545c56e..14f4b1f201ca 100644 --- a/comphelper/source/streaming/basicio.cxx +++ b/comphelper/source/streaming/basicio.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 @@ -170,7 +170,7 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun } //......................................................................... -} // namespace comphelper +} // namespace comphelper //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index fd17bd9e5db6..4ab372f9e414 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.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 @@ -160,7 +160,7 @@ void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgument { if( (location < 0) || (location > SAL_MAX_INT32) ) throw IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("this implementation does not support more than 2GB!")), Reference< XInterface >(static_cast<OWeakObject*>(this)), 0 ); - + // seek operation should be able to resize the stream if ( location > static_cast< sal_Int64 >( maData.size() ) ) maData.resize( static_cast< sal_Int32 >( location ) ); diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 40858acd338b..96c70345b852 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.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 @@ -122,7 +122,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st #ifdef DBG_UTIL m_pFile->getPos(nCurrentPos); -// volatile int dummy = 0; // to take a look at last changes ;-) +// volatile int dummy = 0; // to take a look at last changes ;-) #endif } diff --git a/comphelper/source/streaming/otransactedfilestream.cxx b/comphelper/source/streaming/otransactedfilestream.cxx index bac4403fd6ad..9b1f15ccaae7 100644 --- a/comphelper/source/streaming/otransactedfilestream.cxx +++ b/comphelper/source/streaming/otransactedfilestream.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/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx index f20153ee0aaf..8a36c316b7db 100644 --- a/comphelper/source/streaming/seekableinput.cxx +++ b/comphelper/source/streaming/seekableinput.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 @@ -87,8 +87,8 @@ uno::Reference< io::XInputStream > OSeekableInputWrapper::CheckSeekableCanWrap( if ( xSeek.is() ) return xInStream; - uno::Reference< io::XInputStream > xNewStream( - static_cast< io::XInputStream* >( + uno::Reference< io::XInputStream > xNewStream( + static_cast< io::XInputStream* >( new OSeekableInputWrapper( xInStream, xFactory ) ) ); return xNewStream; } @@ -264,6 +264,6 @@ sal_Int64 SAL_CALL OSeekableInputWrapper::getLength() return m_xCopySeek->getLength(); } -} // namespace comphelper +} // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 4e1cc7ade660..507de9817cb3 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.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/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 02cfd2fe7bc6..b5a07bc2cd5c 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.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/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index d2852b70a901..05d9f3767091 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.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 @@ -45,8 +45,8 @@ using namespace ::osl; //------------------------------------------------------------------ SequenceInputStream::SequenceInputStream(const ByteSequence& rData) -: m_aData(rData) -, m_nPos(0) +: m_aData(rData) +, m_nPos(0) { } @@ -152,7 +152,7 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double ,m_nResizeFactor(_nResizeFactor) ,m_nMinimumResize(_nMinimumResize) ,m_nMaximumResize(_nMaximumResize) - ,m_nSize(0) // starting at position 0 + ,m_nSize(0) // starting at position 0 ,m_bConnected(sal_True) { OSL_ENSURE(m_nResizeFactor > 1, "OSequenceOutputStream::OSequenceOutputStream : invalid resize factor !"); @@ -189,13 +189,13 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rD nNewLength = nCurrentLength + m_nMaximumResize; if (nNewLength < m_nSize + _rData.getLength()) - { // it's not enough .... the data would not fit + { // it's not enough .... the data would not fit // let's take the double amount of the length of the data to be written, as the next write // request could be as large as this one sal_Int32 nNewGrowth = _rData.getLength() * 2; if ((m_nMaximumResize > 0) && (nNewGrowth > m_nMaximumResize)) - { // we came to the limit, again ... + { // we came to the limit, again ... nNewGrowth = m_nMaximumResize; if (nNewGrowth + nCurrentLength < m_nSize + _rData.getLength()) // but it would not fit if we respect the limit diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx index 1fa71fd42682..b95cf146c335 100644 --- a/comphelper/source/streaming/streamsection.cxx +++ b/comphelper/source/streaming/streamsection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,10 +74,10 @@ OStreamSection::OStreamSection(const staruno::Reference< stario::XDataOutputStre OStreamSection::~OStreamSection() { try - { // don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception + { // don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception // handling routing if (m_xInStream.is() && m_xMarkStream.is()) - { // we're working on an input stream + { // we're working on an input stream m_xMarkStream->jumpToMark(m_nBlockStart); m_xInStream->skipBytes(m_nBlockLen); m_xMarkStream->deleteMark(m_nBlockStart); @@ -89,7 +89,7 @@ OStreamSection::~OStreamSection() // nothing to do : the estimation the caller gave us (in the ctor) was correct m_xMarkStream->deleteMark(m_nBlockStart); else - { // the estimation was wrong (or we didn't get one) + { // the estimation was wrong (or we didn't get one) m_nBlockLen = nRealBlockLength; m_xMarkStream->jumpToMark(m_nBlockStart); m_xOutStream->writeLong(m_nBlockLen); @@ -107,7 +107,7 @@ sal_Int32 OStreamSection::available() { sal_Int32 nBytes = 0; try - { // don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception + { // don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception if (m_xInStream.is() && m_xMarkStream.is()) nBytes = m_xMarkStream->offsetToMark(m_nBlockStart) - sizeof(m_nBlockLen); } @@ -118,7 +118,7 @@ sal_Int32 OStreamSection::available() } // ----------------------------------------------------------------------------- -} // namespace comphelper +} // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index 012df7f4fe03..e30491c6bc4d 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -45,9 +45,9 @@ struct TagAttribute_Impl TagAttribute_Impl( const OUString &aName, const OUString &aType, const OUString &aValue ) { - this->sName = aName; - this->sType = aType; - this->sValue = aValue; + this->sName = aName; + this->sType = aType; + this->sValue = aValue; } OUString sName; @@ -125,7 +125,7 @@ AttributeList::~AttributeList() delete m_pImpl; } -void AttributeList::AddAttribute( const OUString &sName , +void AttributeList::AddAttribute( const OUString &sName , const OUString &sType , const OUString &sValue ) { diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 9df5977efb04..ccb77acb4278 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.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 @@ -39,8 +39,8 @@ #include <comphelper/ofopxmlhelper.hxx> #include <comphelper/attributelist.hxx> -#define RELATIONINFO_FORMAT 0 -#define CONTENTTYPE_FORMAT 1 +#define RELATIONINFO_FORMAT 0 +#define CONTENTTYPE_FORMAT 1 #define FORMAT_MAX_ID CONTENTTYPE_FORMAT using namespace ::com::sun::star; @@ -78,7 +78,7 @@ void SAL_CALL OFOPXMLHelper::WriteRelationsInfoSequence( const uno::Reference< i uno::Reference< xml::sax::XDocumentHandler > xWriterHandler( xWriterSource, uno::UNO_QUERY_THROW ); xWriterSource->setOutputStream( xOutStream ); - + ::rtl::OUString aRelListElement( RTL_CONSTASCII_USTRINGPARAM( "Relationships" ) ); ::rtl::OUString aRelElement( RTL_CONSTASCII_USTRINGPARAM( "Relationship" ) ); ::rtl::OUString aIDAttr( RTL_CONSTASCII_USTRINGPARAM( "Id" ) ); @@ -143,7 +143,7 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu uno::Reference< xml::sax::XDocumentHandler > xWriterHandler( xWriterSource, uno::UNO_QUERY_THROW ); xWriterSource->setOutputStream( xOutStream ); - + ::rtl::OUString aTypesElement( RTL_CONSTASCII_USTRINGPARAM( "Types" ) ); ::rtl::OUString aDefaultElement( RTL_CONSTASCII_USTRINGPARAM( "Default" ) ); ::rtl::OUString aOverrideElement( RTL_CONSTASCII_USTRINGPARAM( "Override" ) ); @@ -252,19 +252,19 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OFOPXMLHelper::GetParsingRes } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::startDocument() +void SAL_CALL OFOPXMLHelper::startDocument() throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::endDocument() +void SAL_CALL OFOPXMLHelper::endDocument() throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) +void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw( xml::sax::SAXException, uno::RuntimeException ) { if ( m_nFormat == RELATIONINFO_FORMAT ) @@ -412,7 +412,7 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName ) +void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName ) throw( xml::sax::SAXException, uno::RuntimeException ) { if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT ) @@ -429,25 +429,25 @@ void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName ) } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::characters( const ::rtl::OUString& /*aChars*/ ) +void SAL_CALL OFOPXMLHelper::characters( const ::rtl::OUString& /*aChars*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) +void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) +void SAL_CALL OFOPXMLHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) +void SAL_CALL OFOPXMLHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } diff --git a/comphelper/test/uno_iterators/uno_iterators.cxx b/comphelper/test/uno_iterators/uno_iterators.cxx index c2106068ff46..711b39c0d17c 100644 --- a/comphelper/test/uno_iterators/uno_iterators.cxx +++ b/comphelper/test/uno_iterators/uno_iterators.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ void fill_testdata(Sequence<OUString>& seq) } void print_oustring(const OUString& ustr) -{ cout << OUStringToOString(ustr, RTL_TEXTENCODING_ASCII_US).getStr() << endl; } +{ cout << OUStringToOString(ustr, RTL_TEXTENCODING_ASCII_US).getStr() << endl; } void print_sequence(const Sequence<OUString>& seq) { @@ -159,7 +159,7 @@ void stl_inserting() StlUnoSequence<OUString> stl_result = StlUnoSequence<OUString>::createInstance(result); fill_testdata(s1); fill_testdata(s2); - + list<OUString> temp(stl_s1.begin(), stl_s1.end()); copy(stl_s2.begin()+5, stl_s2.end(), insert_iterator<list<OUString> >(temp, ++temp.begin())); copy(temp.begin(), temp.end(), stl_result.begin()); @@ -203,17 +203,17 @@ int main() stl_algos(); cout << "--- SOME STL CONVERSIONS" << endl; - stl_conversions(); + stl_conversions(); cout << "--- INSERTING IN SEQUENCE" << endl; stl_inserting(); - + cout << "--- COMPARING" << endl; stl_compare(); - + cout << "--- CONST SEQUENCE" << endl; stl_const_sequence(); - + cout << "--- HELPERS IN STL-STYLE" << endl; stl_helpers(); } |