summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--offapi/com/sun/star/ui/test/XUIObject.idl4
-rw-r--r--vcl/source/uitest/uno/uiobject_uno.cxx15
-rw-r--r--vcl/source/uitest/uno/uiobject_uno.hxx3
3 files changed, 18 insertions, 4 deletions
diff --git a/offapi/com/sun/star/ui/test/XUIObject.idl b/offapi/com/sun/star/ui/test/XUIObject.idl
index 0e5192674028..962fde74dd9d 100644
--- a/offapi/com/sun/star/ui/test/XUIObject.idl
+++ b/offapi/com/sun/star/ui/test/XUIObject.idl
@@ -10,13 +10,15 @@
#ifndef __com_sun_star_ui_test_XUIObject_idl__
#define __com_sun_star_ui_test_XUIObject_idl__
+#include <com/sun/star/beans/PropertyValues.idl>
+
module com { module sun { module star { module ui { module test {
interface XUIObject
{
XUIObject getChild([in] string id);
- void executeAction([in] string action);
+ void executeAction([in] string action, [in] com::sun::star::beans::PropertyValues propValues);
};
}; }; }; }; };
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index 5913dff112d4..1d464c729926 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -28,11 +28,22 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UIObjectUnoObj::getChild(
return new UIObjectUnoObj(std::move(pObj));
}
-void SAL_CALL UIObjectUnoObj::executeAction(const OUString& rAction)
+void SAL_CALL UIObjectUnoObj::executeAction(const OUString& rAction, const css::uno::Sequence<css::beans::PropertyValue>& rPropValues)
throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- mpObj->execute(rAction, StringMap());
+ StringMap aMap;
+ for (sal_Int32 i = 0, n = rPropValues.getLength(); i < n; ++i)
+ {
+ OUString aVal;
+ if (!(rPropValues[i].Value >>= aVal))
+ continue;
+
+ aMap[rPropValues[i].Name] = aVal;
+ }
+ mpObj->execute(rAction, aMap);
+}
+
}
OUString SAL_CALL UIObjectUnoObj::getImplementationName()
diff --git a/vcl/source/uitest/uno/uiobject_uno.hxx b/vcl/source/uitest/uno/uiobject_uno.hxx
index 10b6fb36bcd4..6817d82588cd 100644
--- a/vcl/source/uitest/uno/uiobject_uno.hxx
+++ b/vcl/source/uitest/uno/uiobject_uno.hxx
@@ -16,6 +16,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ui/test/XUIObject.hpp>
+#include <com/sun/star/beans/PropertyValues.hpp>
#include <memory>
@@ -39,7 +40,7 @@ public:
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getChild(const OUString& rID)
throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL executeAction(const OUString& rAction)
+ void SAL_CALL executeAction(const OUString& rAction, const css::uno::Sequence<css::beans::PropertyValue>& xPropValues)
throw (css::uno::RuntimeException, std::exception) override;
OUString SAL_CALL getImplementationName()