include/toolkit/controls/unocontrolmodel.hxx | 1 + toolkit/source/controls/unocontrolmodel.cxx | 6 ++++++ 2 files changed, 7 insertions(+)
New commits: commit 0c5c1e831aaf139379134fee63797f02ca5a75e5 Author: Noel Grandin <[email protected]> AuthorDate: Wed Apr 12 12:18:52 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Apr 12 14:18:35 2023 +0200 Revert "remove unnecessary UnoControlModel::setPropertyValues" This reverts commit 19c18c94085f7a70e536a914ed978fc54b5625b9. Because it breaks the MRI extension, I was wrong, it does not do quite the same thing as its superclass method. Change-Id: I65bfb4264615dea5f6d0f2fb7b989352e7e83ee1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150274 Tested-by: Justin Luth <[email protected]> Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index 9a0e2b9de168..35c14fdece7f 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -161,6 +161,7 @@ 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::XFastPropertySet diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 8cb7b3a526f9..4aaf9908ade9 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1248,6 +1248,12 @@ 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();
