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>

6 files changed, 1 insertions, 13 deletions

diff --git a/offapi/com/sun/star/linguistic2/DictionaryList.idl b/offapi/com/sun/star/linguistic2/DictionaryList.idl
index e5fda9cad34e..fc8e06a1e81c 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryList.idl
@@ -20,7 +20,6 @@
 #define __com_sun_star_linguistic2_DictionaryList_idl__
 
 #include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
 
 
 module com { module sun { module star { module linguistic2 {
@@ -40,7 +39,6 @@ published service DictionaryList
 {
     interface com::sun::star::linguistic2::XSearchableDictionaryList;
     interface com::sun::star::lang::XComponent;
-    interface com::sun::star::lang::XServiceInfo;
 };
 
 
diff --git a/offapi/com/sun/star/linguistic2/Hyphenator.idl b/offapi/com/sun/star/linguistic2/Hyphenator.idl
index d89c6ca28942..75796dd754d0 100644
--- a/offapi/com/sun/star/linguistic2/Hyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/Hyphenator.idl
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
 #include <com/sun/star/lang/XServiceDisplayName.idl>
 
 
@@ -38,7 +37,6 @@ published service Hyphenator
     interface com::sun::star::linguistic2::XLinguServiceEventBroadcaster;
     interface com::sun::star::lang::XInitialization;
     interface com::sun::star::lang::XComponent;
-    interface com::sun::star::lang::XServiceInfo;
     interface com::sun::star::lang::XServiceDisplayName;
 };
 
diff --git a/offapi/com/sun/star/linguistic2/LinguProperties.idl b/offapi/com/sun/star/linguistic2/LinguProperties.idl
index 70d3ef68b5b7..36664e6e4750 100644
--- a/offapi/com/sun/star/linguistic2/LinguProperties.idl
+++ b/offapi/com/sun/star/linguistic2/LinguProperties.idl
@@ -32,7 +32,6 @@
 #include <com/sun/star/beans/XPropertySet.idl>
 #include <com/sun/star/beans/XFastPropertySet.idl>
 #include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
 #include <com/sun/star/lang/Locale.idl>
 
 
@@ -45,7 +44,6 @@ published service LinguProperties
     interface com::sun::star::beans::XPropertySet;
     interface com::sun::star::beans::XFastPropertySet;
     interface com::sun::star::lang::XComponent;
-    interface com::sun::star::lang::XServiceInfo;
 
     /** defines whether new German spelling rules should be used for German
          text or not when doing spell checking or hyphenation, or using the
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
index 43f83bbb1c54..efdeb0d7ae1a 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
@@ -20,7 +20,6 @@
 #define __com_sun_star_linguistic2_LinguServiceManager_idl__
 
 #include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
 
 
 module com { module sun { module star { module linguistic2 {
@@ -36,7 +35,6 @@ published service LinguServiceManager
     interface com::sun::star::linguistic2::XLinguServiceManager;
     interface com::sun::star::linguistic2::XAvailableLocales;
     interface com::sun::star::lang::XComponent;
-    interface com::sun::star::lang::XServiceInfo;
 };
 
 
diff --git a/offapi/com/sun/star/linguistic2/SpellChecker.idl b/offapi/com/sun/star/linguistic2/SpellChecker.idl
index 3885c92a702f..371ed3dbe2cb 100644
--- a/offapi/com/sun/star/linguistic2/SpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/SpellChecker.idl
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
 #include <com/sun/star/lang/XServiceDisplayName.idl>
 
 
@@ -38,7 +37,6 @@ published service SpellChecker
     interface com::sun::star::linguistic2::XLinguServiceEventBroadcaster;
     interface com::sun::star::lang::XInitialization;
     interface com::sun::star::lang::XComponent;
-    interface com::sun::star::lang::XServiceInfo;
     interface com::sun::star::lang::XServiceDisplayName;
 };
 
diff --git a/offapi/com/sun/star/linguistic2/Thesaurus.idl b/offapi/com/sun/star/linguistic2/Thesaurus.idl
index 7bed7b247009..b00d2af4de81 100644
--- a/offapi/com/sun/star/linguistic2/Thesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/Thesaurus.idl
@@ -21,13 +21,12 @@
 
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
 #include <com/sun/star/lang/XServiceDisplayName.idl>
 
 
 module com { module sun { module star { module linguistic2 {
 
- published interface XThesaurus;
+published interface XThesaurus;
 
 /** offers thesaurus functionality.
 */
@@ -36,7 +35,6 @@ published service Thesaurus
     interface com::sun::star::linguistic2::XThesaurus;
     interface com::sun::star::lang::XInitialization;
     interface com::sun::star::lang::XComponent;
-    interface com::sun::star::lang::XServiceInfo;
     interface com::sun::star::lang::XServiceDisplayName;
 };