include/comphelper/PropertyInfoHash.hxx | 14 +------- include/comphelper/SettingsHelper.hxx | 52 +++++++++++--------------------- sd/inc/CustomAnimationPreset.hxx | 4 ++ 3 files changed, 24 insertions(+), 46 deletions(-)
New commits: commit 7956ceaf225b4459070e68e6c743396d998b588d Author: Stephan Bergmann <[email protected]> Date: Thu Dec 12 11:47:47 2013 +0100 Missing include Change-Id: I7c8ffab5cef828980faf1bb8768dde9d79a0258b diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index 1d8b98d..c380ba6 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX #define INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX +#include <sal/config.h> + +#include <vector> + #include <boost/shared_ptr.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> commit 2b0063dd49b298153233052a8628eeb8260a2069 Author: Stephan Bergmann <[email protected]> Date: Thu Dec 12 11:36:53 2013 +0100 Remove unnecessary comphelper::eqFunc Change-Id: I94d5e3fff2d1e039051bddfedcedfac04487529a diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx index 6796977..25a1e8d 100644 --- a/include/comphelper/PropertyInfoHash.hxx +++ b/include/comphelper/PropertyInfoHash.hxx @@ -42,24 +42,14 @@ namespace comphelper : mnMapId ( nMapId ) , mpInfo ( pInfo ) {} }; - struct eqFunc - { - sal_Bool operator()( const OUString &r1, - const OUString &r2) const - { - return r1 == r2; - } - }; } typedef boost::unordered_map < OUString, ::comphelper::PropertyInfo*, - OUStringHash, - ::comphelper::eqFunc > PropertyInfoHash; + OUStringHash > PropertyInfoHash; typedef boost::unordered_map < OUString, ::comphelper::PropertyData*, - OUStringHash, - ::comphelper::eqFunc > PropertyDataHash; + OUStringHash > PropertyDataHash; #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 21f901f9fcb8d550fec37ca9caa9645aaae73aa7 Author: Stephan Bergmann <[email protected]> Date: Thu Dec 12 11:27:19 2013 +0100 Fold SettingsHelperNoState, ChainableHelperNoState Change-Id: I94bd49e6460855c58cc9fe2d1c7b1f5f7e6e589a diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx index 13cfd64..20cca7a 100644 --- a/include/comphelper/SettingsHelper.hxx +++ b/include/comphelper/SettingsHelper.hxx @@ -22,14 +22,12 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <comphelper/ChainablePropertySet.hxx> #include <comphelper/solarmutex.hxx> #include <cppuhelper/implbase3.hxx> namespace comphelper { - class ChainablePropertySet; - class ChainablePropertySetInfo; - typedef cppu::WeakImplHelper3 < ::com::sun::star::beans::XPropertySet, @@ -37,15 +35,15 @@ namespace comphelper ::com::sun::star::lang::XServiceInfo > HelperBaseNoState; - template < class ComphelperBase, class ComphelperBaseInfo > class SettingsHelperNoState : + class ChainableHelperNoState : public HelperBaseNoState, - public ComphelperBase + public ChainablePropertySet { public: - SettingsHelperNoState ( ComphelperBaseInfo *pInfo, SolarMutex* pMutex = NULL) - : ComphelperBase ( pInfo, pMutex ) + ChainableHelperNoState ( ChainablePropertySetInfo *pInfo, SolarMutex* pMutex = NULL) + : ChainablePropertySet ( pInfo, pMutex ) {} - virtual ~SettingsHelperNoState () throw( ) {} + virtual ~ChainableHelperNoState () throw( ) {} com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException) { return HelperBaseNoState::queryInterface( aType ); } void SAL_CALL acquire( ) throw () @@ -56,49 +54,43 @@ namespace comphelper // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) - { return ComphelperBase::getPropertySetInfo(); } + { return ChainablePropertySet::getPropertySetInfo(); } virtual void SAL_CALL setPropertyValue( const 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) - { ComphelperBase::setPropertyValue ( aPropertyName, aValue ); } + { ChainablePropertySet::setPropertyValue ( aPropertyName, aValue ); } virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) - { return ComphelperBase::getPropertyValue ( PropertyName ); } + { return ChainablePropertySet::getPropertyValue ( PropertyName ); } virtual void SAL_CALL addPropertyChangeListener( const 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) - { ComphelperBase::addPropertyChangeListener ( aPropertyName, xListener ); } + { ChainablePropertySet::addPropertyChangeListener ( aPropertyName, xListener ); } virtual void SAL_CALL removePropertyChangeListener( const 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) - { ComphelperBase::removePropertyChangeListener ( aPropertyName, aListener ); } + { ChainablePropertySet::removePropertyChangeListener ( aPropertyName, aListener ); } virtual void SAL_CALL addVetoableChangeListener( const 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) - { ComphelperBase::addVetoableChangeListener ( PropertyName, aListener ); } + { ChainablePropertySet::addVetoableChangeListener ( PropertyName, aListener ); } virtual void SAL_CALL removeVetoableChangeListener( const 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) - { ComphelperBase::removeVetoableChangeListener ( PropertyName, aListener ); } + { ChainablePropertySet::removeVetoableChangeListener ( PropertyName, aListener ); } // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< 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) - { ComphelperBase::setPropertyValues ( aPropertyNames, aValues ); } + { ChainablePropertySet::setPropertyValues ( aPropertyNames, aValues ); } virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException) - { return ComphelperBase::getPropertyValues ( aPropertyNames ); } + { return ChainablePropertySet::getPropertyValues ( aPropertyNames ); } virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException) - { ComphelperBase::addPropertiesChangeListener ( aPropertyNames, xListener ); } + { ChainablePropertySet::addPropertiesChangeListener ( aPropertyNames, xListener ); } virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException) - { ComphelperBase::removePropertiesChangeListener ( xListener ); } + { ChainablePropertySet::removePropertiesChangeListener ( xListener ); } virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException) - { ComphelperBase::firePropertiesChangeEvent ( aPropertyNames, xListener ); } + { ChainablePropertySet::firePropertiesChangeEvent ( aPropertyNames, xListener ); } }; - typedef comphelper::SettingsHelperNoState - < - ::comphelper::ChainablePropertySet, - ::comphelper::ChainablePropertySetInfo - > - ChainableHelperNoState; } #endif commit 3d994313bd5e9a31384e3e3ad912cc1d37db8641 Author: Stephan Bergmann <[email protected]> Date: Thu Dec 12 11:17:18 2013 +0100 Remove unused comphelper::MasterHelperNoState Change-Id: I2ef343154a9152b81f8c18c9e114b12b8bd168ab diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx index 37b7381..13cfd64 100644 --- a/include/comphelper/SettingsHelper.hxx +++ b/include/comphelper/SettingsHelper.hxx @@ -27,8 +27,6 @@ namespace comphelper { - class MasterPropertySet; - class MasterPropertySetInfo; class ChainablePropertySet; class ChainablePropertySetInfo; @@ -97,12 +95,6 @@ namespace comphelper }; typedef comphelper::SettingsHelperNoState < - ::comphelper::MasterPropertySet, - ::comphelper::MasterPropertySetInfo - > - MasterHelperNoState; - typedef comphelper::SettingsHelperNoState - < ::comphelper::ChainablePropertySet, ::comphelper::ChainablePropertySetInfo > _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
