i121544 - Clean-up MessageBox API

6 files changed, 10 insertions, 8 deletions

diff --git a/desktop/test/deployment/active/Dispatch.java b/desktop/test/deployment/active/Dispatch.java
index d7f1cd1d9536..6fb3fa9d2c8b 100644
--- a/desktop/test/deployment/active/Dispatch.java
+++ b/desktop/test/deployment/active/Dispatch.java
@@ -24,6 +24,7 @@
 package com.sun.star.comp.test.deployment.active_java;
 
 import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.MessageBoxType;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.XMessageBox;
 import com.sun.star.awt.XMessageBoxFactory;
@@ -74,7 +75,7 @@ public final class Dispatch extends WeakBase implements XServiceInfo, XDispatch
                             smgr.createInstanceWithContext(
                                 "com.sun.star.frame.Desktop", context)).
                          getCurrentFrame().getComponentWindow())),
-                    new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+                    MessageBoxType.INFOBOX, MessageBoxButtons.BUTTONS_OK,
                     "active", "java");
             box.execute();
             UnoRuntime.queryInterface(XComponent.class, box).dispose();
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index f29270a2bb8f..768d3927cb4d 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -250,8 +250,7 @@ void Dispatch::dispatch(
                             css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
                         css::uno::UNO_SET_THROW)->getComponentWindow(),
                     css::uno::UNO_QUERY_THROW),
-                css::awt::Rectangle(),
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+                css::awt::MessageBoxType_INFOBOX,
                 css::awt::MessageBoxButtons::BUTTONS_OK,
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("active")),
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
diff --git a/desktop/test/deployment/active/active_python.py b/desktop/test/deployment/active/active_python.py
index e357271ba6ab..01f72e55121d 100644
--- a/desktop/test/deployment/active/active_python.py
+++ b/desktop/test/deployment/active/active_python.py
@@ -24,6 +24,7 @@ import unohelper
 
 from com.sun.star.awt import Rectangle
 from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.awt.MessageBoxType import INFOBOX
 from com.sun.star.frame import XDispatch, XDispatchProvider
 from com.sun.star.lang import XServiceInfo
 from com.sun.star.registry import InvalidRegistryException
@@ -79,7 +80,7 @@ class Dispatch(unohelper.Base, XServiceInfo, XDispatch):
                 smgr.createInstanceWithContext( \
                     "com.sun.star.frame.Desktop", self.context). \
                     getCurrentFrame().getComponentWindow(), \
-                Rectangle(), "infobox", BUTTONS_OK, "active", "python")
+                INFOBOX, BUTTONS_OK, "active", "python")
         box.execute();
         box.dispose();
 
diff --git a/desktop/test/deployment/passive/Dispatch.java b/desktop/test/deployment/passive/Dispatch.java
index 59634a775444..5647b23f235d 100644
--- a/desktop/test/deployment/passive/Dispatch.java
+++ b/desktop/test/deployment/passive/Dispatch.java
@@ -24,6 +24,7 @@
 package com.sun.star.comp.test.deployment.passive_java;
 
 import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.MessageBoxType;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.XMessageBox;
 import com.sun.star.awt.XMessageBoxFactory;
@@ -74,7 +75,7 @@ public final class Dispatch extends WeakBase implements XServiceInfo, XDispatch
                             smgr.createInstanceWithContext(
                                 "com.sun.star.frame.Desktop", context)).
                          getCurrentFrame().getComponentWindow())),
-                    new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+                    MessageBoxType.INFOBOX, MessageBoxButtons.BUTTONS_OK,
                     "passive", "java");
             box.execute();
             UnoRuntime.queryInterface(XComponent.class, box).dispose();
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index abbb6681e4c3..1a39332a9889 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -248,8 +248,7 @@ void Dispatch::dispatch(
                             css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
                         css::uno::UNO_SET_THROW)->getComponentWindow(),
                     css::uno::UNO_QUERY_THROW),
-                css::awt::Rectangle(),
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+                css::awt::MessageBoxType_INFOBOX,
                 css::awt::MessageBoxButtons::BUTTONS_OK,
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passive")),
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
diff --git a/desktop/test/deployment/passive/passive_python.py b/desktop/test/deployment/passive/passive_python.py
index bff7e3da323a..9ed30595de08 100644
--- a/desktop/test/deployment/passive/passive_python.py
+++ b/desktop/test/deployment/passive/passive_python.py
@@ -24,6 +24,7 @@ import unohelper
 
 from com.sun.star.awt import Rectangle
 from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.awt.MessageBoxType import INFOBOX
 from com.sun.star.frame import XDispatch, XDispatchProvider
 from com.sun.star.lang import XServiceInfo
 
@@ -78,7 +79,7 @@ class Dispatch(unohelper.Base, XServiceInfo, XDispatch):
                 smgr.createInstanceWithContext( \
                     "com.sun.star.frame.Desktop", self.context). \
                     getCurrentFrame().getComponentWindow(), \
-                Rectangle(), "infobox", BUTTONS_OK, "passive", "python")
+                INFOBOX, BUTTONS_OK, "passive", "python")
         box.execute();
         box.dispose();