include/comphelper/propshlp.hxx | 17 +++++++++-------- include/toolkit/controls/unocontrolmodel.hxx | 1 - toolkit/source/controls/unocontrolmodel.cxx | 6 ------ 3 files changed, 9 insertions(+), 15 deletions(-)
New commits: commit 19c18c94085f7a70e536a914ed978fc54b5625b9 Author: Noel Grandin <[email protected]> AuthorDate: Fri Mar 31 14:32:23 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Mar 31 13:35:19 2023 +0000 remove unnecessary UnoControlModel::setPropertyValues which does exactly the same thing as the method it overrides Change-Id: Ib227011795f0cf6336fb1e01c14636a9996bb164 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149835 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index a33d73b897bc..a0d8e39d9901 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -161,7 +161,6 @@ public: // css::beans::XMultiPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) override; protected: // override setValue methods to handle properties of FontDescriptor // css::beans::XPropertySet diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index a881d2781b1e..bfadc7f6bb8a 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1259,12 +1259,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > UnoControlModel::getProperty return css::uno::Reference< css::beans::XPropertySetInfo >(); } -void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) -{ - std::unique_lock aGuard( m_aMutex ); - setPropertyValuesImpl(aGuard, rPropertyNames, Values); -} - void UnoControlModel::setPropertyValuesImpl( std::unique_lock<std::mutex>& rGuard, const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) { sal_Int32 nProps = rPropertyNames.getLength(); commit 739da6657a665d38ef99032fe9756519a40ef2f6 Author: Noel Grandin <[email protected]> AuthorDate: Fri Mar 31 14:27:51 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Mar 31 13:35:10 2023 +0000 make some method in comphelper::OPropertySetHelper final Change-Id: Ia745a0d7568cf8f9180ed2e28cfd11da94cd186a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149834 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/comphelper/propshlp.hxx b/include/comphelper/propshlp.hxx index e982077166cf..c9e397ae8d15 100644 --- a/include/comphelper/propshlp.hxx +++ b/include/comphelper/propshlp.hxx @@ -116,25 +116,26 @@ public: */ virtual css::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) override final; + /** Ignored if the property is not bound. */ virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, - const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) override; + const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) override final; /** Ignored if the property is not bound. */ virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, - const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) override; + const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) override final; /** Ignored if the property is not constrained. */ virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName, - const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override; + const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override final; /** Ignored if the property is not constrained. */ virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, - const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override; + const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override final; /** Throw UnknownPropertyException or PropertyVetoException if the property with the name @@ -158,18 +159,18 @@ public: const css::uno::Sequence<css::uno::Any>& Values) override; virtual css::uno::Sequence<css::uno::Any> SAL_CALL - getPropertyValues(const css::uno::Sequence<::rtl::OUString>& PropertyNames) override; + getPropertyValues(const css::uno::Sequence<::rtl::OUString>& PropertyNames) override final; virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence<::rtl::OUString>& PropertyNames, - const css::uno::Reference<css::beans::XPropertiesChangeListener>& Listener) override; + const css::uno::Reference<css::beans::XPropertiesChangeListener>& Listener) override final; virtual void SAL_CALL removePropertiesChangeListener( - const css::uno::Reference<css::beans::XPropertiesChangeListener>& Listener) override; + const css::uno::Reference<css::beans::XPropertiesChangeListener>& Listener) override final; virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence<::rtl::OUString>& PropertyNames, - const css::uno::Reference<css::beans::XPropertiesChangeListener>& Listener) override; + const css::uno::Reference<css::beans::XPropertiesChangeListener>& Listener) override final; /** The property sequence is created in the call. The interface isn't used after the call.
