summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-04-12 12:18:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-04-12 14:18:35 +0200
commit0c5c1e831aaf139379134fee63797f02ca5a75e5 (patch)
treed6dfb95747cc4290453cef04b4e3b8ccd2acaa12 /toolkit
parent81dc568ab3f504bca58810da0b0bd3c4c2737096 (diff)
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 <jluth@mail.com> Reviewed-by: Justin Luth <jluth@mail.com> Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx6
1 files changed, 6 insertions, 0 deletions
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();