fdo#46808, Adapt task::InteractionHandler UNO service to new style

Since we don't need to expose XInitialisation, we can make the new-style
service implement XInteractionHandler2.

Change-Id: Ib27beed1c12df17592c6472d6f58c233d2c41558

3 files changed, 9 insertions, 24 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 104d76c34115..e31beef09ac1 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -270,6 +270,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\
 	SystemShellExecute \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
+	InteractionHandler \
 	InteractionRequestStringResolver \
 	JobExecutor \
 	OfficeRestartManager \
@@ -1218,7 +1219,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\
 	AsyncJob \
-	InteractionHandler \
 	Job \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
diff --git a/offapi/com/sun/star/task/InteractionHandler.idl b/offapi/com/sun/star/task/InteractionHandler.idl
index 1e603a2a3fac..524c385ce4ac 100644
--- a/offapi/com/sun/star/task/InteractionHandler.idl
+++ b/offapi/com/sun/star/task/InteractionHandler.idl
@@ -21,8 +21,8 @@
 #define __com_sun_star_task_InteractionHandler_idl__
 
 module com { module sun { module star {
-    module lang { published interface XInitialization; };
-    module task { published interface XInteractionHandler; };
+    module task { published interface XInteractionHandler2; };
+    module awt { published interface XWindow; };
 }; }; };
 
 module com { module sun { module star { module task {
@@ -147,28 +147,13 @@ module com { module sun { module star { module task {
     that the types you specify are general enough to cover all requests you want to handle, but also specific
     enough to not cover requests which other handlers might be interested in.</p>
  */
-published service InteractionHandler
+published service InteractionHandler : XInteractionHandler2
 {
-    /** Handle an interaction request.
-     */
-    interface com::sun::star::task::XInteractionHandler;
-
-    /** Initialize the interaction handler.
-
-        <P>The arguments must be a sequence of
-        <type scope="com::sun::star::beans">PropertyValue</type>s.  The
-        currently supported properties are:
-        <UL>
-            <LI><code>"Parent"</code> of type
-            <type scope="com::sun::star::awt">XWindow</type> denotes the
-            parent window for any GUI dialogs the interaction handler pops up;
-            it is strongly recommended that this property is supplied;</LI>
-            <LI><code>"Context"</code> of type <atom>string</atom> is a
-            textual description of the current context (used, e.g., as a first
-            line of text in error boxes); this property is optional.</LI>
-        </UL></P>
-     */
-    interface com::sun::star::lang::XInitialization;
+  createDefault();
+
+  createWithParent([in] com::sun::star::awt::XWindow parent);
+
+  createWithParentAndContext([in] com::sun::star::awt::XWindow parent, [in] string context);
 };
 
 }; }; }; };
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 312d0eb217cc..8a14c1485672 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb