From 8b34ad6204ee35b7dca10d2b1c9761dfa72684a7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 21 Aug 2012 07:39:30 +0200 Subject: 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 --- .../sun/star/datatransfer/DataFormatTranslator.idl | 5 ----- .../star/datatransfer/MimeContentTypeFactory.idl | 5 ----- .../datatransfer/clipboard/ClipboardManager.idl | 5 ----- .../datatransfer/clipboard/GenericClipboard.idl | 5 ----- .../datatransfer/clipboard/SystemClipboard.idl | 5 ----- .../sun/star/datatransfer/dnd/OleDragSource.idl | 5 ----- .../sun/star/datatransfer/dnd/OleDropTarget.idl | 5 ----- .../sun/star/datatransfer/dnd/X11DragSource.idl | 5 ----- .../sun/star/datatransfer/dnd/X11DropTarget.idl | 5 ----- .../sun/star/drawing/DrawingDocumentDrawView.idl | 8 -------- offapi/com/sun/star/drawing/GenericDrawPage.idl | 9 --------- offapi/com/sun/star/i18n/BreakIterator.idl | 7 +------ offapi/com/sun/star/i18n/ChapterCollator.idl | 7 +------ .../com/sun/star/i18n/CharacterClassification.idl | 7 +------ offapi/com/sun/star/i18n/Collator.idl | 7 +------ offapi/com/sun/star/i18n/IndexEntrySupplier.idl | 2 -- offapi/com/sun/star/i18n/InputSequenceChecker.idl | 2 -- offapi/com/sun/star/i18n/LocaleCalendar.idl | 2 -- offapi/com/sun/star/i18n/LocaleData.idl | 2 -- offapi/com/sun/star/i18n/NativeNumberSupplier.idl | 7 +------ offapi/com/sun/star/i18n/NumberFormatMapper.idl | 7 +------ offapi/com/sun/star/i18n/OrdinalSuffix.idl | 7 +------ offapi/com/sun/star/i18n/Transliteration.idl | 2 -- offapi/com/sun/star/linguistic2/DictionaryList.idl | 2 -- offapi/com/sun/star/linguistic2/Hyphenator.idl | 2 -- .../com/sun/star/linguistic2/LinguProperties.idl | 2 -- .../sun/star/linguistic2/LinguServiceManager.idl | 2 -- offapi/com/sun/star/linguistic2/SpellChecker.idl | 2 -- offapi/com/sun/star/linguistic2/Thesaurus.idl | 4 +--- offapi/com/sun/star/presentation/OutlineView.idl | 7 ------- .../com/sun/star/presentation/PresentationView.idl | 9 +-------- offapi/com/sun/star/presentation/PreviewView.idl | 8 +------- offapi/com/sun/star/presentation/SlidesView.idl | 7 ------- offapi/com/sun/star/setup/Setup.idl | 10 +--------- offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl | 5 ----- offapi/com/sun/star/system/ProxySettings.idl | 4 ---- offapi/com/sun/star/system/SimpleCommandMail.idl | 4 ---- offapi/com/sun/star/system/SimpleSystemMail.idl | 4 ---- offapi/com/sun/star/system/SystemShellExecute.idl | 4 ---- offapi/com/sun/star/ui/dialogs/FilePicker.idl | 5 ----- offapi/com/sun/star/ui/dialogs/FolderPicker.idl | 4 ---- .../sun/star/xml/crypto/SecurityEnvironment.idl | 2 -- offapi/com/sun/star/xml/crypto/XMLEncryption.idl | 2 -- .../sun/star/xml/crypto/XMLEncryptionTemplate.idl | 2 -- .../com/sun/star/xml/crypto/XMLSecurityContext.idl | 2 -- offapi/com/sun/star/xml/crypto/XMLSignature.idl | 2 -- .../sun/star/xml/crypto/XMLSignatureTemplate.idl | 2 -- offapi/com/sun/star/xml/crypto/sax/Decryptor.idl | 2 -- offapi/com/sun/star/xml/crypto/sax/Encryptor.idl | 2 -- .../com/sun/star/xml/crypto/sax/SAXEventKeeper.idl | 2 -- .../sun/star/xml/crypto/sax/SignatureCreator.idl | 2 -- .../sun/star/xml/crypto/sax/SignatureVerifier.idl | 2 -- .../sun/star/xml/wrapper/XMLDocumentWrapper.idl | 2 -- .../com/sun/star/xml/wrapper/XMLElementWrapper.idl | 2 -- offapi/type_reference/types.rdb | Bin 7654400 -> 7653888 bytes 55 files changed, 11 insertions(+), 221 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl index 2864453a8fc2..f8c174767698 100644 --- a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl +++ b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl @@ -20,7 +20,6 @@ #ifndef __com_sun_star_datatransfer_DataFormatTranslator_idl__ #define __com_sun_star_datatransfer_DataFormatTranslator_idl__ -#include #include @@ -43,10 +42,6 @@ published service DataFormatTranslator */ interface XDataFormatTranslator; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl index 9d8b41679b12..0e7934091e9b 100644 --- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl +++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl @@ -21,7 +21,6 @@ #define __com_sun_star_datatransfer_MimeContentType_idl__ #include -#include #include @@ -48,10 +47,6 @@ published service MimeContentTypeFactory */ interface XMimeContentTypeFactory; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl index 4b5562594162..7e9a5289ce5e 100644 --- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl +++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl @@ -21,7 +21,6 @@ #define __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__ #include -#include #include @@ -45,10 +44,6 @@ published service ClipboardManager */ interface com::sun::star::lang::XComponent; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl index da5bc7d415bc..6f46b34f776d 100644 --- a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl +++ b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl @@ -21,7 +21,6 @@ #define __com_sun_star_datatransfer_clipboard_GenericClipboard_idl__ #include -#include #include #include @@ -52,10 +51,6 @@ published service GenericClipboard */ interface com::sun::star::lang::XComponent; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl index d5d2f083574f..c34181ceb3d7 100644 --- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl +++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl @@ -21,7 +21,6 @@ #define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__ #include -#include #include #include @@ -69,10 +68,6 @@ published service SystemClipboard */ interface com::sun::star::lang::XComponent; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl index c9fc1d93da0b..a51f8102dc85 100644 --- a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl +++ b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl @@ -30,7 +30,6 @@ #define __com_sun_star_datatransfer_dnd_OleDragSource_idl__ #include -#include #include #include @@ -68,10 +67,6 @@ published service OleDragSource */ interface com::sun::star::lang::XComponent; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl index c21f55d36132..e1e1a27d9c8f 100644 --- a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl +++ b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl @@ -30,7 +30,6 @@ #define __com_sun_star_datatransfer_dnd_OleDropTarget_idl__ #include -#include #include #include @@ -60,10 +59,6 @@ published service OleDropTarget */ interface com::sun::star::lang::XComponent; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl index 4d576b8896ce..c987b479f717 100644 --- a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl +++ b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl @@ -21,7 +21,6 @@ #define __com_sun_star_datatransfer_dnd_X11DragSource_idl__ #include -#include #include #include @@ -54,10 +53,6 @@ published service X11DragSource */ interface com::sun::star::lang::XComponent; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl index 0a79343b6797..624afdc6b4b4 100644 --- a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl +++ b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl @@ -21,7 +21,6 @@ #define __com_sun_star_datatransfer_dnd_X11DropTarget_idl__ #include -#include #include #include @@ -57,10 +56,6 @@ published service X11DropTarget */ interface com::sun::star::lang::XComponent; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl index 84f0a7563598..198c813c86ac 100644 --- a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl +++ b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl @@ -27,7 +27,6 @@ #include -#include #include #include #include @@ -82,13 +81,6 @@ published service DrawingDocumentDrawView interface com::sun::star::view::XSelectionSupplier; - - /** provides the names of the services implemented by - this instance. - */ - interface com::sun::star::lang::XServiceInfo; - - /** If the view is in master page mode, the view shows the master pages of this model. */ diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl index 593319b40b56..05c84ce391d0 100644 --- a/offapi/com/sun/star/drawing/GenericDrawPage.idl +++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl @@ -38,8 +38,6 @@ #include -#include - #include #include @@ -115,13 +113,6 @@ published service GenericDrawPage [optional] interface com::sun::star::container::XNamed; - // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::lang::XServiceInfo - /** returns the services implemented by this - instance. - */ - interface com::sun::star::lang::XServiceInfo; - - // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::beans::XPropertySet /** gives you access to the properties of this DrawPage. diff --git a/offapi/com/sun/star/i18n/BreakIterator.idl b/offapi/com/sun/star/i18n/BreakIterator.idl index b65cc4b1f45c..765bd6b022dc 100644 --- a/offapi/com/sun/star/i18n/BreakIterator.idl +++ b/offapi/com/sun/star/i18n/BreakIterator.idl @@ -19,7 +19,6 @@ #ifndef __com_sun_star_i18n_BreakIterator_idl__ #define __com_sun_star_i18n_BreakIterator_idl__ -#include #include @@ -32,11 +31,7 @@

It also contains a BreakIterator service for Asian languages.

*/ -published service BreakIterator -{ - interface com::sun::star::i18n::XBreakIterator; - interface com::sun::star::lang::XServiceInfo; -}; +published service BreakIterator : com::sun::star::i18n::XBreakIterator; }; }; }; }; diff --git a/offapi/com/sun/star/i18n/ChapterCollator.idl b/offapi/com/sun/star/i18n/ChapterCollator.idl index 14b13f5f047c..6fced5b79056 100644 --- a/offapi/com/sun/star/i18n/ChapterCollator.idl +++ b/offapi/com/sun/star/i18n/ChapterCollator.idl @@ -19,7 +19,6 @@ #ifndef __com_sun_star_i18n_ChapterCollator_idl__ #define __com_sun_star_i18n_ChapterCollator_idl__ -#include #include @@ -27,11 +26,7 @@ /// Specific collator to sort chapter numbering. -published service ChapterCollator -{ - interface com::sun::star::i18n::XCollator; - interface com::sun::star::lang::XServiceInfo; -}; +published service ChapterCollator : com::sun::star::i18n::XCollator; }; }; }; }; diff --git a/offapi/com/sun/star/i18n/CharacterClassification.idl b/offapi/com/sun/star/i18n/CharacterClassification.idl index 33ebce26d491..927ea37912d7 100644 --- a/offapi/com/sun/star/i18n/CharacterClassification.idl +++ b/offapi/com/sun/star/i18n/CharacterClassification.idl @@ -20,7 +20,6 @@ #ifndef __com_sun_star_i18n_CharacterClassification_idl__ #define __com_sun_star_i18n_CharacterClassification_idl__ -#include #include @@ -32,11 +31,7 @@ module com { module sun { module star { module i18n {

Provides also a generic parser functionality.

*/ -published service CharacterClassification -{ - interface com::sun::star::i18n::XCharacterClassification; - interface com::sun::star::lang::XServiceInfo; -}; +published service CharacterClassification : com::sun::star::i18n::XCharacterClassification; }; }; }; }; diff --git a/offapi/com/sun/star/i18n/Collator.idl b/offapi/com/sun/star/i18n/Collator.idl index 779bf2ac85b7..9917cd2f51aa 100644 --- a/offapi/com/sun/star/i18n/Collator.idl +++ b/offapi/com/sun/star/i18n/Collator.idl @@ -19,7 +19,6 @@ #ifndef __com_sun_star_i18n_Collator_idl__ #define __com_sun_star_i18n_Collator_idl__ -#include #include @@ -30,11 +29,7 @@ Access collation algorithms of different locales. */ -published service Collator -{ - interface com::sun::star::i18n::XCollator; - interface com::sun::star::lang::XServiceInfo; -}; +published service Collator : com::sun::star::i18n::XCollator; }; }; }; }; diff --git a/offapi/com/sun/star/i18n/IndexEntrySupplier.idl b/offapi/com/sun/star/i18n/IndexEntrySupplier.idl index 2b6d3ade0614..7b4b1c5f7e60 100644 --- a/offapi/com/sun/star/i18n/IndexEntrySupplier.idl +++ b/offapi/com/sun/star/i18n/IndexEntrySupplier.idl @@ -20,7 +20,6 @@ #ifndef __com_sun_star_i18n_IndexEntrySupplier_idl__ #define __com_sun_star_i18n_IndexEntrySupplier_idl__ -#include #include #include @@ -32,7 +31,6 @@ module com { module sun { module star { module i18n { published service IndexEntrySupplier { interface com::sun::star::i18n::XIndexEntrySupplier; - interface com::sun::star::lang::XServiceInfo; [optional] interface com::sun::star::i18n::XExtendedIndexEntrySupplier; }; diff --git a/offapi/com/sun/star/i18n/InputSequenceChecker.idl b/offapi/com/sun/star/i18n/InputSequenceChecker.idl index 41e2e6cc0ef2..acb859d30c3c 100644 --- a/offapi/com/sun/star/i18n/InputSequenceChecker.idl +++ b/offapi/com/sun/star/i18n/InputSequenceChecker.idl @@ -20,7 +20,6 @@ #ifndef __com_sun_star_i18n_InputSequenceChecker_idl__ #define __com_sun_star_i18n_InputSequenceChecker_idl__ -#include #include @@ -34,7 +33,6 @@ module com { module sun { module star { module i18n { published service InputSequenceChecker { interface com::sun::star::i18n::XInputSequenceChecker; - interface com::sun::star::lang::XServiceInfo; [optional] interface com::sun::star::i18n::XExtendedInputSequenceChecker; }; diff --git a/offapi/com/sun/star/i18n/LocaleCalendar.idl b/offapi/com/sun/star/i18n/LocaleCalendar.idl index b67bfce9f57d..e08d4f7aefe4 100644 --- a/offapi/com/sun/star/i18n/LocaleCalendar.idl +++ b/offapi/com/sun/star/i18n/LocaleCalendar.idl @@ -29,7 +29,6 @@ #ifndef __com_sun_star_i18n_LocaleCalendar_idl__ #define __com_sun_star_i18n_LocaleCalendar_idl__ -#include #include #include #include @@ -42,7 +41,6 @@ module com { module sun { module star { module i18n { published service LocaleCalendar { interface com::sun::star::i18n::XCalendar; - interface com::sun::star::lang::XServiceInfo; [optional] interface com::sun::star::i18n::XExtendedCalendar; [optional] interface com::sun::star::i18n::XCalendar3; diff --git a/offapi/com/sun/star/i18n/LocaleData.idl b/offapi/com/sun/star/i18n/LocaleData.idl index 617b1c72c779..fd951688305f 100644 --- a/offapi/com/sun/star/i18n/LocaleData.idl +++ b/offapi/com/sun/star/i18n/LocaleData.idl @@ -29,7 +29,6 @@ #ifndef __com_sun_star_i18n_LocaleData_idl__ #define __com_sun_star_i18n_LocaleData_idl__ -#include #include @@ -40,7 +39,6 @@ module com { module sun { module star { module i18n { published service LocaleData { interface com::sun::star::i18n::XLocaleData; - interface com::sun::star::lang::XServiceInfo; [optional] interface com::sun::star::i18n::XLocaleData2; [optional] interface com::sun::star::i18n::XLocaleData3; diff --git a/offapi/com/sun/star/i18n/NativeNumberSupplier.idl b/offapi/com/sun/star/i18n/NativeNumberSupplier.idl index 7c56294c00ad..47cdcbcfabe3 100644 --- a/offapi/com/sun/star/i18n/NativeNumberSupplier.idl +++ b/offapi/com/sun/star/i18n/NativeNumberSupplier.idl @@ -20,7 +20,6 @@ #ifndef __com_sun_star_i18n_NativeNumberSupplier_idl__ #define __com_sun_star_i18n_NativeNumberSupplier_idl__ -#include #include @@ -31,11 +30,7 @@ module com { module sun { module star { module i18n { @since OOo 1.1.2 */ -published service NativeNumberSupplier -{ - interface com::sun::star::i18n::XNativeNumberSupplier; - interface com::sun::star::lang::XServiceInfo; -}; +published service NativeNumberSupplier : com::sun::star::i18n::XNativeNumberSupplier; }; }; }; }; diff --git a/offapi/com/sun/star/i18n/NumberFormatMapper.idl b/offapi/com/sun/star/i18n/NumberFormatMapper.idl index c3ba5fa712a4..4e7325a84319 100644 --- a/offapi/com/sun/star/i18n/NumberFormatMapper.idl +++ b/offapi/com/sun/star/i18n/NumberFormatMapper.idl @@ -21,7 +21,6 @@ #define __com_sun_star_i18n_NumberFormatMapper_idl__ #include -#include module com { module sun { module star { module i18n { @@ -31,11 +30,7 @@ module com { module sun { module star { module i18n { number formatter */ -published service NumberFormatMapper -{ - interface com::sun::star::i18n::XNumberFormatCode; - interface com::sun::star::lang::XServiceInfo; -}; +published service NumberFormatMapper : com::sun::star::i18n::XNumberFormatCode; }; }; }; }; #endif diff --git a/offapi/com/sun/star/i18n/OrdinalSuffix.idl b/offapi/com/sun/star/i18n/OrdinalSuffix.idl index 6bc99e200304..fadac755b9a2 100644 --- a/offapi/com/sun/star/i18n/OrdinalSuffix.idl +++ b/offapi/com/sun/star/i18n/OrdinalSuffix.idl @@ -20,7 +20,6 @@ #ifndef INCLUDED_com_sun_star_i18n_OrdinalSuffix_idl #define INCLUDED_com_sun_star_i18n_OrdinalSuffix_idl -#include #include @@ -37,11 +36,7 @@ module com { module sun { module star { module i18n { change without notice and should not be used outside the OOo core. */ -service OrdinalSuffix -{ - interface com::sun::star::i18n::XOrdinalSuffix; - interface com::sun::star::lang::XServiceInfo; -}; +service OrdinalSuffix : com::sun::star::i18n::XOrdinalSuffix; }; }; }; }; diff --git a/offapi/com/sun/star/i18n/Transliteration.idl b/offapi/com/sun/star/i18n/Transliteration.idl index 075ff7a10376..2cc2bed30918 100644 --- a/offapi/com/sun/star/i18n/Transliteration.idl +++ b/offapi/com/sun/star/i18n/Transliteration.idl @@ -20,7 +20,6 @@ #ifndef __com_sun_star_i18n_Transliteration_idl__ #define __com_sun_star_i18n_Transliteration_idl__ -#include #include #include @@ -32,7 +31,6 @@ module com { module sun { module star { module i18n { published service Transliteration { interface com::sun::star::i18n::XTransliteration; - interface com::sun::star::lang::XServiceInfo; [optional] interface com::sun::star::i18n::XExtendedTransliteration; }; 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 -#include 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 #include -#include #include @@ -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 #include #include -#include #include @@ -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 -#include 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 #include -#include #include @@ -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 #include -#include #include 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; }; diff --git a/offapi/com/sun/star/presentation/OutlineView.idl b/offapi/com/sun/star/presentation/OutlineView.idl index 9c73263b3e91..fcfc8b5cd1d3 100644 --- a/offapi/com/sun/star/presentation/OutlineView.idl +++ b/offapi/com/sun/star/presentation/OutlineView.idl @@ -34,7 +34,6 @@ #include -#include #include #include @@ -71,12 +70,6 @@ published service OutlineView interface com::sun::star::beans::XPropertySet; - /** provides the names of the services implemented by - this instance. - */ - interface com::sun::star::lang::XServiceInfo; - - /** This is the area that is currently visible. */ [readonly, property] com::sun::star::awt::Rectangle VisibleArea; diff --git a/offapi/com/sun/star/presentation/PresentationView.idl b/offapi/com/sun/star/presentation/PresentationView.idl index bbbc9b0c8564..9300dcb85778 100644 --- a/offapi/com/sun/star/presentation/PresentationView.idl +++ b/offapi/com/sun/star/presentation/PresentationView.idl @@ -25,13 +25,12 @@ #include -#include #include #include - module com { module sun { module star { module presentation { +module com { module sun { module star { module presentation { /** This component integrates a view to a slide show of a presentation @@ -62,12 +61,6 @@ published service PresentationView interface com::sun::star::beans::XPropertySet; - /** provides the names of the services implemented by - this instance. - */ - interface com::sun::star::lang::XServiceInfo; - - /** This is the drawing page that is currently visible. */ [property] com::sun::star::drawing::XDrawPage CurrentPage; diff --git a/offapi/com/sun/star/presentation/PreviewView.idl b/offapi/com/sun/star/presentation/PreviewView.idl index 9ccd9cc06653..5f28582f508d 100644 --- a/offapi/com/sun/star/presentation/PreviewView.idl +++ b/offapi/com/sun/star/presentation/PreviewView.idl @@ -31,7 +31,7 @@ #include - module com { module sun { module star { module presentation { +module com { module sun { module star { module presentation { /** This component integrates a preview view to a slide show of a presentation @@ -65,12 +65,6 @@ published service PreviewView interface com::sun::star::beans::XPropertySet; - /** provides the names of the services implemented by - this instance. - */ - interface com::sun::star::lang::XServiceInfo; - - /** This is the drawing page that is currently visible. */ [property] com::sun::star::drawing::XDrawPage CurrentPage; diff --git a/offapi/com/sun/star/presentation/SlidesView.idl b/offapi/com/sun/star/presentation/SlidesView.idl index 5ca8324f848f..0e8d0a5278b3 100644 --- a/offapi/com/sun/star/presentation/SlidesView.idl +++ b/offapi/com/sun/star/presentation/SlidesView.idl @@ -25,7 +25,6 @@ #include -#include #include #include @@ -63,12 +62,6 @@ published service SlidesView interface com::sun::star::beans::XPropertySet; - /** provides the names of the services implemented by - this instance. - */ - interface com::sun::star::lang::XServiceInfo; - - /** This is the area that is currently visible. */ [readonly, property] com::sun::star::awt::Rectangle VisibleArea; diff --git a/offapi/com/sun/star/setup/Setup.idl b/offapi/com/sun/star/setup/Setup.idl index 1fc95cd29fc1..feba86775c19 100644 --- a/offapi/com/sun/star/setup/Setup.idl +++ b/offapi/com/sun/star/setup/Setup.idl @@ -20,19 +20,11 @@ #define __com_sun_star_setup_Setup_idl__ #include -#include module com { module sun { module star { module setup { /// @deprecated -published service Setup -{ - // DocMerge: empty anyway - interface com::sun::star::setup::XSetup; - - // DocMerge: empty anyway - interface com::sun::star::lang::XServiceInfo; - }; +published service Setup : com::sun::star::setup::XSetup; }; }; }; }; #endif diff --git a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl index 90fd6ab91152..cb806ac3ed57 100644 --- a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl +++ b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl @@ -21,7 +21,6 @@ #include #include -#include module com { module sun { module star { module sheet { @@ -66,10 +65,6 @@ published service SpreadsheetDrawPage */ interface com::sun::star::drawing::XShapeGrouper; - - /** returns the services implemented by this instance. - */ - interface com::sun::star::lang::XServiceInfo; }; diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl index bdea6a7c2691..76e9292dbe7a 100644 --- a/offapi/com/sun/star/system/ProxySettings.idl +++ b/offapi/com/sun/star/system/ProxySettings.idl @@ -43,10 +43,6 @@ published service ProxySettings */ interface XProxySettings; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/system/SimpleCommandMail.idl b/offapi/com/sun/star/system/SimpleCommandMail.idl index 93bfbefef0b6..542f930678a0 100644 --- a/offapi/com/sun/star/system/SimpleCommandMail.idl +++ b/offapi/com/sun/star/system/SimpleCommandMail.idl @@ -43,10 +43,6 @@ published service SimpleCommandMail */ interface XSimpleMailClientSupplier; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/system/SimpleSystemMail.idl b/offapi/com/sun/star/system/SimpleSystemMail.idl index 5336fd7c1f05..7feebf676095 100644 --- a/offapi/com/sun/star/system/SimpleSystemMail.idl +++ b/offapi/com/sun/star/system/SimpleSystemMail.idl @@ -42,10 +42,6 @@ published service SimpleSystemMail */ interface XSimpleMailClientSupplier; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/system/SystemShellExecute.idl b/offapi/com/sun/star/system/SystemShellExecute.idl index 4ba5087bac80..e5b714306f04 100644 --- a/offapi/com/sun/star/system/SystemShellExecute.idl +++ b/offapi/com/sun/star/system/SystemShellExecute.idl @@ -41,10 +41,6 @@ published service SystemShellExecute */ interface XSystemShellExecute; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/ui/dialogs/FilePicker.idl b/offapi/com/sun/star/ui/dialogs/FilePicker.idl index fdd4685829d0..a009820008f1 100644 --- a/offapi/com/sun/star/ui/dialogs/FilePicker.idl +++ b/offapi/com/sun/star/ui/dialogs/FilePicker.idl @@ -30,7 +30,6 @@ #define __com_sun_star_ui_dialogs_FilePicker_idl__ #include -#include #include #include #include @@ -121,10 +120,6 @@ published service FilePicker */ interface com::sun::star::lang::XComponent; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl index 7681affadf1c..c0490c92bfe2 100644 --- a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl +++ b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl @@ -50,10 +50,6 @@ published service FolderPicker */ interface XFolderPicker; - /** Service should always support this interface. - */ - interface com::sun::star::lang::XServiceInfo; - /** Service should always support this interface. */ interface com::sun::star::lang::XTypeProvider; diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl index 1a9260248c37..18d12a9b11ce 100644 --- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl +++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl @@ -29,7 +29,6 @@ #include #include #include -#include module com { module sun { module star { module xml { module crypto { @@ -40,7 +39,6 @@ service SecurityEnvironment { interface com::sun::star::xml::crypto::XSecurityEnvironment ; interface com::sun::star::lang::XInitialization ; interface com::sun::star::lang::XUnoTunnel; - interface com::sun::star::lang::XServiceInfo ; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl index 4fe9aca036c6..2fae78e840cd 100644 --- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl +++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl @@ -28,7 +28,6 @@ #include #include #include -#include module com { module sun { module star { module xml { module crypto { @@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto { service XMLEncryption { interface com::sun::star::xml::crypto::XXMLEncryption ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl index 5eaef5b50161..efbe9b03ee8c 100644 --- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl +++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl @@ -28,7 +28,6 @@ #include #include #include -#include module com { module sun { module star { module xml { module crypto { @@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto { service XMLEncryptionTemplate { interface com::sun::star::xml::crypto::XXMLEncryptionTemplate ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; } ; diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl index 4b0542901eb0..90c3211fcafb 100644 --- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl +++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl @@ -28,7 +28,6 @@ #include #include #include -#include module com { module sun { module star { module xml { module crypto { @@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto { service XMLSecurityContext { interface com::sun::star::xml::crypto::XXMLSecurityContext ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl index a6055a9ce376..f19d9619e8a9 100644 --- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl +++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl @@ -28,7 +28,6 @@ #include #include #include -#include module com { module sun { module star { module xml { module crypto { @@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto { service XMLSignature { interface com::sun::star::xml::crypto::XXMLSignature ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl index ef9cdf755dd6..08752cec62e5 100644 --- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl +++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl @@ -28,7 +28,6 @@ #include #include #include -#include module com { module sun { module star { module xml { module crypto { @@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto { service XMLSignatureTemplate { interface com::sun::star::xml::crypto::XXMLSignatureTemplate ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl index e0d6ce80c03d..81be04f308a6 100644 --- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl +++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -46,7 +45,6 @@ service Decryptor { interface XKeyCollector ; interface XMissionTaker ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; }; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl index 37bdbdd2a8f0..8bb64d4aef63 100644 --- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl +++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -48,7 +47,6 @@ service Encryptor { interface XKeyCollector ; interface XMissionTaker ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; }; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl index 42f0cbd1a433..1cbacf1190e1 100644 --- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl +++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -44,7 +43,6 @@ service SAXEventKeeper { interface XSAXEventKeeperStatusChangeBroadcaster ; interface com::sun::star::xml::sax::XDocumentHandler ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; }; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl index 8c663d7c05bb..6a80df340c9f 100644 --- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl +++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -51,7 +50,6 @@ service SignatureCreator interface XMissionTaker ; interface com::sun::star::xml::crypto::XUriBinding; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; } ; } ; } ; } ; } ; } ; } ; #endif diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl index 321b60da44fe..3bbe6e795792 100644 --- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl +++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -48,7 +47,6 @@ service SignatureVerifier { interface XMissionTaker ; interface com::sun::star::xml::crypto::XUriBinding; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; }; } ; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl index 0b87540f9e25..70a229d4f2a4 100644 --- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl +++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl @@ -28,7 +28,6 @@ #include #include #include -#include module com { module sun { module star { module xml { module wrapper { @@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module wrapper { service XMLDocumentWrapper { interface com::sun::star::xml::wrapper::XXMLDocumentWrapper ; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; }; } ; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl index f099e3fb34bf..20970a05b100 100644 --- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl +++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl @@ -29,7 +29,6 @@ #include #include #include -#include module com { module sun { module star { module xml { module wrapper { @@ -40,7 +39,6 @@ service XMLElementWrapper { interface com::sun::star::xml::wrapper::XXMLElementWrapper ; interface com::sun::star::lang::XUnoTunnel; interface com::sun::star::lang::XInitialization ; - interface com::sun::star::lang::XServiceInfo ; }; } ; } ; } ; } ; } ; diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index ed7e61a20fca..29e48ad90610 100644 Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ -- cgit