summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/uitest/uitest.cxx12
-rw-r--r--vcl/source/uitest/uno/uitest_uno.cxx12
2 files changed, 10 insertions, 14 deletions
diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index 1058ecefb956..086adfab0537 100644
--- a/vcl/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -17,24 +17,20 @@
#include <comphelper/dispatchcommand.hxx>
-void UITest::executeCommand(const OUString& rCommand)
+bool UITest::executeCommand(const OUString& rCommand)
{
- bool bSuccess = comphelper::dispatchCommand(
+ return comphelper::dispatchCommand(
rCommand,
{{"SynchronMode", -1, css::uno::Any(true),
css::beans::PropertyState_DIRECT_VALUE}});
-
- SAL_WARN_IF(!bSuccess, "vcl.uitest", "failed to execute command: " << rCommand);
}
-void UITest::executeDialog(const OUString& rCommand)
+bool UITest::executeDialog(const OUString& rCommand)
{
- bool bSuccess = comphelper::dispatchCommand(
+ return comphelper::dispatchCommand(
rCommand,
{{"SynchronMode", -1, css::uno::Any(false),
css::beans::PropertyState_DIRECT_VALUE}});
-
- SAL_WARN_IF(!bSuccess, "vcl.uitest", "failed to execute dialog command: " << rCommand);
}
std::unique_ptr<UIObject> UITest::getFocusTopWindow()
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx
index 1d874c32c7d1..9486ff752b97 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -38,9 +38,9 @@ public:
UITestUnoObj();
- void SAL_CALL executeCommand(const OUString& rCommand) override;
+ sal_Bool SAL_CALL executeCommand(const OUString& rCommand) override;
- void SAL_CALL executeDialog(const OUString& rCommand) override;
+ sal_Bool SAL_CALL executeDialog(const OUString& rCommand) override;
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getTopFocusWindow() override;
@@ -59,16 +59,16 @@ UITestUnoObj::UITestUnoObj():
{
}
-void SAL_CALL UITestUnoObj::executeCommand(const OUString& rCommand)
+sal_Bool SAL_CALL UITestUnoObj::executeCommand(const OUString& rCommand)
{
SolarMutexGuard aGuard;
- UITest::executeCommand(rCommand);
+ return UITest::executeCommand(rCommand);
}
-void SAL_CALL UITestUnoObj::executeDialog(const OUString& rCommand)
+sal_Bool SAL_CALL UITestUnoObj::executeDialog(const OUString& rCommand)
{
SolarMutexGuard aGuard;
- UITest::executeDialog(rCommand);
+ return UITest::executeDialog(rCommand);
}
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocusWindow()