fdo#46808, Remove unnecessary XServiceInfo lines in UNO IDL

XServiceInfo does not need to be declared as a supported sub-interface
for services, it is always implicitly there.
Also, for those services that now only contain one interface, convert
them to new-style service IDL declarations.

Change-Id: I325c27f287a02de6bdfc8bb6e5bf6c2a4ae0a753

Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

4 files changed, 31 insertions, 59 deletions

diff --git a/udkapi/com/sun/star/lang/MultiServiceFactory.idl b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
index d7438b12b8fc..d9aceecc7228 100644
--- a/udkapi/com/sun/star/lang/MultiServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
@@ -54,10 +54,6 @@ published service MultiServiceFactory
     */
     interface com::sun::star::lang::XMultiComponentFactory;
 
-    /** Factories, as well as all other services, should always support
-        this interface.
-    */
-    interface com::sun::star::lang::XServiceInfo;
 };
 
 
diff --git a/udkapi/com/sun/star/loader/Dynamic.idl b/udkapi/com/sun/star/loader/Dynamic.idl
index 0b0caa1f26da..fbf9176ada65 100644
--- a/udkapi/com/sun/star/loader/Dynamic.idl
+++ b/udkapi/com/sun/star/loader/Dynamic.idl
@@ -26,30 +26,23 @@ module com {  module sun {  module star {  module loader {
  published interface XImplementationLoader;
 
 
-/** makes it possible to access services accessible via a <code>UnoUrlResolver</code>
-    E.g., instantiation of services in another process. This service is still in an
-    experimental state and should not be used in a production environment.
- */
-published service Dynamic
-{
-    /** is used to write persistent information into the given registry
-        for accessing a <code>SingleServiceFactory</code> and for activating this
-                implementation.
-     */
-    /** allows registration and activation of described service.
-        The url parameter has to be a comma-separated list of attributes.
-        The following attribute types are understood:
-        servicename = the service name to register this component under
-        link        = a parameter given to a resolver to get a <code>SingleServiceFactory</code>
-        resolver    = a <code>UnoUrlResolver</code> service, which is used to resolve the link
-    */
-    interface XImplementationLoader;
-
-
-    /** gives information about other supported services
-     */
-    interface com::sun::star::lang::XServiceInfo;
-};
+/**
+   Makes it possible to access services accessible via a <code>UnoUrlResolver</code>
+   E.g., instantiation of services in another process. This service is still in an
+   experimental state and should not be used in a production environment.
+
+   Is used to write persistent information into the given registry
+   for accessing a <code>SingleServiceFactory</code> and for activating this
+   implementation.
+
+   Allows registration and activation of described service.
+    The url parameter has to be a comma-separated list of attributes.
+    The following attribute types are understood:
+    servicename = the service name to register this component under
+    link        = a parameter given to a resolver to get a <code>SingleServiceFactory</code>
+    resolver    = a <code>UnoUrlResolver</code> service, which is used to resolve the link
+*/
+published service Dynamic : XImplementationLoader;
 
 }; }; }; };
 
diff --git a/udkapi/com/sun/star/loader/Java.idl b/udkapi/com/sun/star/loader/Java.idl
index 764e9377a60f..bf8731d3e3b0 100644
--- a/udkapi/com/sun/star/loader/Java.idl
+++ b/udkapi/com/sun/star/loader/Java.idl
@@ -21,28 +21,19 @@
 
 #include <com/sun/star/lang/XServiceInfo.idl>
 
- module com {  module sun {  module star {  module loader {
+module com {  module sun {  module star {  module loader {
 
- published interface XImplementationLoader;
+published interface XImplementationLoader;
 
 
-// DocMerge from xml: service com::sun::star::loader::Java
-/** allows to access a java component stored with a .jar file
- */
-published service Java
-{
-
-    /** is used for writing persistent information in the registry for
-                external implementation and for activating this implementation. The
-                locationUrls must be absolute file urls.
-     */
-    interface XImplementationLoader;
-
+/**
+  Allows to access a java component stored with a .jar file.
 
-    /** gives information about other supported services
-     */
-    interface com::sun::star::lang::XServiceInfo;
-};
+  Is used for writing persistent information in the registry for
+            external implementation and for activating this implementation. The
+            locationUrls must be absolute file urls.
+*/
+published service Java : XImplementationLoader;
 
 
 }; }; }; };
diff --git a/udkapi/com/sun/star/loader/SharedLibrary.idl b/udkapi/com/sun/star/loader/SharedLibrary.idl
index 9cb3c7ccaf8a..6f6f7790d5a5 100644
--- a/udkapi/com/sun/star/loader/SharedLibrary.idl
+++ b/udkapi/com/sun/star/loader/SharedLibrary.idl
@@ -26,22 +26,14 @@
  published interface XImplementationLoader;
 
 
-/** allows to access a native component stored in a shared library.
- */
-published service SharedLibrary
-{
+/**
+  Allows to access a native component stored in a shared library.
 
-    /** is used for writing persistent information in the registry for
+  Is used for writing persistent information in the registry for
                 an external implementation and for activating this
                 implementation.
-     */
-    interface XImplementationLoader;
-
-
-    /** gives information about other supported services
-     */
-    interface com::sun::star::lang::XServiceInfo;
-};
+*/
+published service SharedLibrary : XImplementationLoader;
 
 }; }; }; }; //module com.sun.star.loader