fdo#46808, Convert script::InvocationAdapterFactory to new style

Change-Id: I2fe24c863f4c43471f46032ed15fcd5b98863fc1

3 files changed, 3 insertions, 17 deletions

diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 011e4872933f..5e723a17ad59 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registr
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\
 	Engine \
-	InvocationAdapterFactory \
 	JavaScript \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
@@ -137,6 +136,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
 	AllListenerAdapter \
 	Converter \
 	Invocation \
+	InvocationAdapterFactory \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\
 	NamingService \
diff --git a/udkapi/com/sun/star/script/InvocationAdapterFactory.idl b/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
index 200872843a38..766a2d04ee94 100644
--- a/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
+++ b/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
@@ -19,12 +19,9 @@
 #ifndef __com_sun_star_script_InvocationAdapterFactory_idl__
 #define __com_sun_star_script_InvocationAdapterFactory_idl__
 
-#include <com/sun/star/script/XInvocationAdapterFactory.idl>
 #include <com/sun/star/script/XInvocationAdapterFactory2.idl>
 
-
-
- module com {  module sun {  module star {  module script {
+module com {  module sun {  module star {  module script {
 
 /** Provides functionality to create an adapter that supports (a)
     special interface type(s) and maps calls to the interface's
@@ -43,18 +40,7 @@
         <type scope="com::sun::star::script">XInvocationAdapterFactory2</type>.
     </p>
  */
-published service InvocationAdapterFactory
-{
-    /** Interface for creating adapter objects.
-        This interface is deprecated.  Use <type>XInvocationAdapterFactory2</type>.
-        @deprecated
-    */
-    interface com::sun::star::script::XInvocationAdapterFactory;
-
-    /** Interface for creating adapter objects.
-    */
-    interface com::sun::star::script::XInvocationAdapterFactory2;
-};
+published service InvocationAdapterFactory : XInvocationAdapterFactory2;
 
 
 }; }; }; };
diff --git a/udkapi/type_reference/udkapi.rdb b/udkapi/type_reference/udkapi.rdb
index 469512a5700f..f1f890b456e3 100644
--- a/udkapi/type_reference/udkapi.rdb
+++ b/udkapi/type_reference/udkapi.rdb