fdo#46808, Adapt UNO services to new style

Update selected IDL files to use new syntax.
Update the makefiles to generate the necessary new include files.

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

32 files changed, 202 insertions, 359 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index f9aee0738346..ffe8d7732245 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -47,6 +47,9 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,
 	ContainerWindowProvider \
 	DialogProvider \
 	DialogProvider2 \
+	MenuBar \
+	PopupMenu \
+	TabController \
 	UnoControlDialogModelProvider \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
@@ -88,6 +91,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/depl
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
 	DocumentProperties \
 	DocumentRevisionListPersistence \
+	OleEmbeddedServerRegistration \
 	OOXMLDocumentPropertiesImporter \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
@@ -105,8 +109,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/draw
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
 	DocumentCloser \
+	FileSystemStorageFactory \
 	InstanceLocker \
 	OLESimpleStorage \
+	StorageFactory \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\
 	DefaultFormComponentInspectorModel \
@@ -114,8 +120,15 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\
 	FormOperations \
 ))
+$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
+	DispatchHelper \
+	DispatchRecorderSupplier \
+	DocumentTemplates \
+	MediaTypeDetectionHelper \
+))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
 	GraphicObject \
+	GraphicProvider \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
 	DefaultHelpProvider \
@@ -145,6 +158,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\
 	Manager \
 ))
+$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
+	MozillaBootstrap \
+))
+$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
+	PluginManager \
+))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\
 	SlideShow \
 	TransitionFactory \
@@ -184,6 +203,9 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/reso
 	StringResourceWithLocation \
 	StringResourceWithStorage \
 ))
+$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\
+	ScannerManager \
+))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\
 	DocumentDialogLibraryContainer \
 	DocumentScriptLibraryContainer \
@@ -216,6 +238,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/shee
 	ExternalSheetCache \
 	FilterFormulaParser \
 	FormulaOpCodeMapper \
+	RecentFunctions \
 	Solver \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\
@@ -224,11 +247,25 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smar
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
 	InteractionRequestStringResolver \
+	JobExecutor \
 	OfficeRestartManager \
 	PasswordContainerInteractionHandler \
 ))
+$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\
+	DefaultNumberingProvider \
+))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\
+	AnyCompareFactory \
+	CachedContentResultSetFactory \
+	CachedContentResultSetStubFactory \
+	CachedDynamicResultSetFactory \
+	CachedDynamicResultSetStubFactory \
 	CommandEnvironment \
+	ContentProviderProxyFactory \
+	PropertiesManager \
+	SimpleFileAccess \
+	SortedDynamicResultSetFactory \
+	Store \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
 	GlobalAcceleratorConfiguration \
@@ -239,7 +276,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/d
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
 	JobManager \
+	PathSubstitution \
+	TextSearch \
 	UriAbbreviation \
+	URLTransformer \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\
 	FastShapeContextHandler \
@@ -296,11 +336,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/a
 	AccessibleWindow \
 	AnimatedImagesControl \
 	AnimatedImagesControlModel \
-	MenuBar \
-	PopupMenu \
 	RoadmapItem \
 	SpinningProgressControlModel \
-	TabController \
 	TabControllerModel \
 	Toolkit \
 	UnoControl \
@@ -545,7 +582,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d
 	LinkTargets \
 	MediaDescriptor \
 	OfficeDocument \
-	OleEmbeddedServerRegistration \
 	PDFDialog \
 	Settings \
 	StandaloneDocumentInfo \
@@ -630,9 +666,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/e
 	BaseStorage \
 	EmbeddedObjectDescriptor \
 	FileSystemStorage \
-	FileSystemStorageFactory \
 	Storage \
-	StorageFactory \
 	StorageStream \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
@@ -753,11 +787,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
 	Desktop \
 	DesktopTask \
 	DesktopTasks \
-	DispatchHelper \
 	DispatchProvider \
 	DispatchRecorder \
-	DispatchRecorderSupplier \
-	DocumentTemplates \
 	Frame \
 	FrameControl \
 	FrameLoader \
@@ -765,7 +796,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
 	FramesContainer \
 	GlobalEventBroadcaster \
 	LayoutManager \
-	MediaTypeDetectionHelper \
 	ModuleManager \
 	PopupMenuController \
 	PopupMenuControllerFactory \
@@ -788,7 +818,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/g
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\
 	Graphic \
 	GraphicDescriptor \
-	GraphicProvider \
 	GraphicRasterizer \
 	GraphicRendererVCL \
 	MediaProperties \
@@ -837,7 +866,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/l
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\
 	MenuProxy \
 	MenuProxyListener \
-	MozillaBootstrap \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\
 	Package \
@@ -848,9 +876,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/p
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\
 	ZipFileAccess \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/plugin,\
-	PluginManager \
-))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
 	ChartShape \
 	CustomPresentation \
@@ -899,9 +924,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	analysisadd \
 	dateadd \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scanner,\
-	ScannerManager \
-))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
 	BrowseNode \
 	BrowseNodeFactory \
@@ -1090,7 +1112,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
 	NamedRanges \
 	NamedRangesEnumeration \
 	RangeSelectionArguments \
-	RecentFunctions \
 	Scenario \
 	Scenarios \
 	ScenariosEnumeration \
@@ -1192,7 +1213,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
 	AsyncJob \
 	InteractionHandler \
 	Job \
-	JobExecutor \
 	PasswordContainer \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
@@ -1224,7 +1244,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
 	ChapterNumberingRule \
 	ContentIndex \
 	ContentIndexMark \
-	DefaultNumberingProvider \
 	Defaults \
 	DependentTextField \
 	DocumentIndex \
@@ -1377,20 +1396,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
 	Title \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\
-	AnyCompareFactory \
 	CachedContentResultSet \
-	CachedContentResultSetFactory \
 	CachedContentResultSetStub \
-	CachedContentResultSetStubFactory \
 	CachedDynamicResultSet \
-	CachedDynamicResultSetFactory \
 	CachedDynamicResultSetStub \
-	CachedDynamicResultSetStubFactory \
 	CmisContentProvider \
 	Content \
 	ContentProvider \
 	ContentProviderProxy \
-	ContentProviderProxyFactory \
 	ContentResultSet \
 	ContentTransmitter \
 	DefaultHierarchyDataSource \
@@ -1419,14 +1432,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u
 	PackageFolderContent \
 	PackageStreamContent \
 	PersistentPropertySet \
-	PropertiesManager \
 	PropertySetRegistry \
 	RemoteAccessContentProvider \
 	RemoteContentProviderAcceptor \
 	RemoteProxyContentProvider \
-	SimpleFileAccess \
-	SortedDynamicResultSetFactory \
-	Store \
 	TransientDocumentsContentProvider \
 	TransientDocumentsDocumentContent \
 	TransientDocumentsFolderContent \
@@ -1470,14 +1479,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u
 	NumberFormatter \
 	OfficeInstallationDirectories \
 	PathSettings \
-	PathSubstitution \
 	ReplaceDescriptor \
 	SearchDescriptor \
 	SortDescriptor \
 	SortDescriptor2 \
 	Sortable \
-	TextSearch \
-	URLTransformer \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\
 	OfficeDocumentView \
diff --git a/offapi/com/sun/star/awt/MenuBar.idl b/offapi/com/sun/star/awt/MenuBar.idl
index 922fa8f1eeed..8372b022621c 100644
--- a/offapi/com/sun/star/awt/MenuBar.idl
+++ b/offapi/com/sun/star/awt/MenuBar.idl
@@ -43,10 +43,7 @@ module com {  module sun {  module star {  module awt {
        to set an menu bar object.
     </p>
  */
-published service MenuBar
-{
-    interface XMenuBar;
-};
+published service MenuBar : XMenuBar;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/PopupMenu.idl b/offapi/com/sun/star/awt/PopupMenu.idl
index 0e62e7799d77..dff404a516f4 100644
--- a/offapi/com/sun/star/awt/PopupMenu.idl
+++ b/offapi/com/sun/star/awt/PopupMenu.idl
@@ -42,10 +42,7 @@ module com {  module sun {  module star {  module awt {
        menu. It's also possible to use a pop-up menu to integrate it into
        another menu.</p>
  */
-published service PopupMenu
-{
-    interface XPopupMenu;
-};
+published service PopupMenu : XPopupMenu;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/TabController.idl b/offapi/com/sun/star/awt/TabController.idl
index 37e5d3fc895a..402c7e0bf048 100644
--- a/offapi/com/sun/star/awt/TabController.idl
+++ b/offapi/com/sun/star/awt/TabController.idl
@@ -39,11 +39,7 @@
 
 /** specifies a standard tab controller.
  */
-published service TabController
-{
-    interface com::sun::star::awt::XTabController;
-
-};
+published service TabController : XTabController;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
index 6878e4746c9e..b6f62f1168d2 100644
--- a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
+++ b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
@@ -46,11 +46,7 @@ module com {  module sun {  module star {  module document {
      @since OOo 1.1.2
  */
 published service OleEmbeddedServerRegistration
-{
-
-    interface com::sun::star::uno::XInterface;
-
-};
+    : com::sun::star::uno::XInterface;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
index be201c22878d..dc74a4391d35 100644
--- a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
@@ -40,65 +40,60 @@
 /** The <type>FileSystemStorageFactory</type> is a service that allows to
     create a <type>FileSystemStorage</type> based on URL. The URL must point
     to a folder.
- */
+
+    <p>
+    In case
+    <method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
+    call is used the result storage will be open in read-write mode based
+    on an arbitrary file system folder.
+    </p>
+
+    <p>
+    In case
+    <method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
+    call is used a sequence of the following parameters can be used:
+    </p>
+
+    <dl>
+        <dt>parameter 1</dt>
+        <dd>
+                  specifies source of the object, it must be a string
+                  containing URL.
+        </dd>
+
+        <dt>parameter 2</dt>
+        <dd>
+                  specifies mode the storage should be open in, can take
+                  values from <type>ElementModes</type> constant set.
+        </dd>
+
+        <dt>parameter 3</dt>
+        <dd>
+                  allows to provide
+                  <type scope="com::sun::star::document">MediaDescryptor</type>
+                  to the storage so some parts can be used for
+                  initialization, it can be for example
+                  <type scope="com::sun::star::task">XInteractionHandler</type>
+                  implementation.
+        </dd>
+    </dl>
+
+    <p>
+    The parameters are optional, that means that sequence can be empty or
+    contain only first parameter, or first and second one. In case
+    no parameters are provided the call works the same way as
+    <member scope="com::sun::star::lang">XSingleServiceFactory::createInstance</member>.
+    In case only first parameter is provided, the storage is opened in
+    readonly mode.
+    </p>
+
+    <p>
+    The opened storages can support read access in addition to
+    specified one.
+    </p>
+*/
 published service FileSystemStorageFactory
-{
-    // ----------------------------------------------------------------------
-    /** A storage can be created through this interface.
-
-        <p>
-        In case
-        <method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
-        call is used the result storage will be open in read-write mode based
-        on an arbitrary file system folder.
-        </p>
-
-        <p>
-        In case
-        <method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
-        call is used a sequence of the following parameters can be used:
-        </p>
-
-        <dl>
-            <dt>parameter 1</dt>
-            <dd>
-                      specifies source of the object, it must be a string
-                      containing URL.
-            </dd>
-
-            <dt>parameter 2</dt>
-            <dd>
-                      specifies mode the storage should be open in, can take
-                      values from <type>ElementModes</type> constant set.
-            </dd>
-
-            <dt>parameter 3</dt>
-            <dd>
-                      allows to provide
-                      <type scope="com::sun::star::document">MediaDescryptor</type>
-                      to the storage so some parts can be used for
-                      initialization, it can be for example
-                      <type scope="com::sun::star::task">XInteractionHandler</type>
-                      implementation.
-            </dd>
-        </dl>
-
-        <p>
-        The parameters are optional, that means that sequence can be empty or
-        contain only first parameter, or first and second one. In case
-        no parameters are provided the call works the same way as
-        <member scope="com::sun::star::lang">XSingleServiceFactory::createInstance</member>.
-        In case only first parameter is provided, the storage is opened in
-        readonly mode.
-        </p>
-
-        <p>
-        The opened storages can support read access in addition to
-        specified one.
-        </p>
-     */
-    interface ::com::sun::star::lang::XSingleServiceFactory;
-};
+    : ::com::sun::star::lang::XSingleServiceFactory;
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/StorageFactory.idl b/offapi/com/sun/star/embed/StorageFactory.idl
index c4480555d0b7..8a355cd87429 100644
--- a/offapi/com/sun/star/embed/StorageFactory.idl
+++ b/offapi/com/sun/star/embed/StorageFactory.idl
@@ -39,83 +39,78 @@
 //============================================================================
 /** The <type>StorageFactory</type> is a service that allows to create
     a storage based on either stream or URL.
- */
+
+    <p>
+    In case
+    <method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
+    call is used the result storage will be open in read-write mode based
+    on an arbitrary medium.
+    </p>
+
+    <p>
+    In case
+    <method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
+    call is used a sequence of the following parameters can be used:
+    </p>
+
+    <dl>
+        <dt>parameter 1</dt>
+        <dd>
+                  specifies source of the object, it can be a string
+                  containing URL, an
+                  <type scope="com::sun::star::io">XStream</type>
+                  implementation or
+                  <type scope="com::sun::star::io">XInputStream</type>;
+                  in case of
+                  <type scope="com::sun::star::io">XStream</type>
+                  implementation
+                  the <type scope="com::sun::star::io">XSeekable</type>
+                  interface must be supported.
+        </dd>
+
+        <dt>parameter 2</dt>
+        <dd>
+                  specifies mode the storage should be open in, can take
+                  values from <type>ElementModes</type> constant set.
+        </dd>
+
+        <dt>parameter 3</dt>
+        <dd>
+                  this parameter represents
+                  <type scope="com::sun::star::uno">Any</type>
+                  containing a sequence of
+                  <type scope="com::sun::star::beans">PropertyValue</type>.<br>
+                  The parameter can contain entries from
+                  <type scope="com::sun::star::document">MediaDescryptor</type>
+                  to transport some document info during the storage
+                  initialization, it can be for example
+                  <type scope="com::sun::star::task">XInteractionHandler</type>
+                  implementation, password for the storage and repair
+                  package flag.<br>
+                  Additionally the parameter might contain property with the name
+                  "StorageFormat" that can take values from
+                  <type scope="com::sun::star::embed">StorageFormats</type>.
+                  If the property is not provided a storage of package format
+                  is created.
+        </dd>
+    </dl>
+
+    <p>
+    The parameters are optional, that means that sequence can be empty or
+    contain only first parameter, or first and second one. In case
+    no parameters are provided the call works the same way as
+    <member scope="com::sun::star::lang">XSingleServiceFactory::createInstance</member>.
+    In case only first parameter is provided, the storage is opened in
+    readonly mode.
+    </p>
+
+    <p>
+    The opened root storage can support read access in addition to
+    specified one.
+    </p>
+*/
 published service StorageFactory
-{
-    // ----------------------------------------------------------------------
-    /** A storage can be created through this interface.
-
-        <p>
-        In case
-        <method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
-        call is used the result storage will be open in read-write mode based
-        on an arbitrary medium.
-        </p>
-
-        <p>
-        In case
-        <method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
-        call is used a sequence of the following parameters can be used:
-        </p>
-
-        <dl>
-            <dt>parameter 1</dt>
-            <dd>
-                      specifies source of the object, it can be a string
-                      containing URL, an
-                      <type scope="com::sun::star::io">XStream</type>
-                      implementation or
-                      <type scope="com::sun::star::io">XInputStream</type>;
-                      in case of
-                      <type scope="com::sun::star::io">XStream</type>
-                      implementation
-                      the <type scope="com::sun::star::io">XSeekable</type>
-                      interface must be supported.
-            </dd>
-
-            <dt>parameter 2</dt>
-            <dd>
-                      specifies mode the storage should be open in, can take
-                      values from <type>ElementModes</type> constant set.
-            </dd>
-
-            <dt>parameter 3</dt>
-            <dd>
-                      this parameter represents
-                      <type scope="com::sun::star::uno">Any</type>
-                      containing a sequence of
-                      <type scope="com::sun::star::beans">PropertyValue</type>.<br>
-                      The parameter can contain entries from
-                      <type scope="com::sun::star::document">MediaDescryptor</type>
-                      to transport some document info during the storage
-                      initialization, it can be for example
-                      <type scope="com::sun::star::task">XInteractionHandler</type>
-                      implementation, password for the storage and repair
-                      package flag.<br>
-                      Additionally the parameter might contain property with the name
-                      "StorageFormat" that can take values from
-                      <type scope="com::sun::star::embed">StorageFormats</type>.
-                      If the property is not provided a storage of package format
-                      is created.
-            </dd>
-        </dl>
-
-        <p>
-        The parameters are optional, that means that sequence can be empty or
-        contain only first parameter, or first and second one. In case
-        no parameters are provided the call works the same way as
-        <member scope="com::sun::star::lang">XSingleServiceFactory::createInstance</member>.
-        In case only first parameter is provided, the storage is opened in
-        readonly mode.
-        </p>
-
-        <p>
-        The opened root storage can support read access in addition to
-        specified one.
-        </p>
-     */
-    interface ::com::sun::star::lang::XSingleServiceFactory;
-};
+    : ::com::sun::star::lang::XSingleServiceFactory;
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchHelper.idl b/offapi/com/sun/star/frame/DispatchHelper.idl
index 5ffc8d0275f2..e061813c29f8 100644
--- a/offapi/com/sun/star/frame/DispatchHelper.idl
+++ b/offapi/com/sun/star/frame/DispatchHelper.idl
@@ -45,19 +45,12 @@ module com {  module sun {  module star {  module frame {
     </p>
 
     @see DispatchProvider
+    @see XDispatchProvider
+    @see XDispatch
 
     @since OOo 1.1.2
  */
-published service DispatchHelper
-{
-    //-------------------------------------------------------------------------
-    /** provides the easy way for dispatch requests.
-
-        @see XDispatchProvider
-        @see XDispatch
-     */
-    interface XDispatchHelper;
-};
+published service DispatchHelper : XDispatchHelper;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
index 47f4b7cc58d5..252a2957b52a 100644
--- a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
@@ -52,13 +52,7 @@
     @see Frame
     @since OOo 1.1.2
  */
-published service DispatchRecorderSupplier
-{
-    //-------------------------------------------------------------------------
-    /** provides access to a <type>DispatchRecorder</type> and helps on recording
-     */
-    interface com::sun::star::frame::XDispatchRecorderSupplier;
-};
+published service DispatchRecorderSupplier : XDispatchRecorderSupplier;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DocumentTemplates.idl b/offapi/com/sun/star/frame/DocumentTemplates.idl
index e66561c6457e..ac8dd134a581 100644
--- a/offapi/com/sun/star/frame/DocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/DocumentTemplates.idl
@@ -38,14 +38,7 @@ module com {  module sun {  module star {  module frame {
 /** is an abstract service for accessing the document templates of the office
     and manipulate them ( add or rename or remove templates )
 */
-published service DocumentTemplates
-{
-    //-------------------------------------------------------------------------
-    /** implements a high level interface on top of an ucb content provider
-        which is used for template configuration
-     */
-    interface XDocumentTemplates;
-};
+published service DocumentTemplates : XDocumentTemplates;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
index 326bea765aed..5fb76b8e53de 100644
--- a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
+++ b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
@@ -37,20 +37,15 @@
 //=============================================================================
 /** provides for mapping a given sequence of content identifier strings
     to a sequence of respective media (mime) types
+
+    <p>
+    Order of given and their returned corresponding strings is important.
+    Don't pack or optimize it. Every item of [in] list must match
+    to an item of [out] list.
+    </p>
  */
 published service MediaTypeDetectionHelper
-{
-    //-------------------------------------------------------------------------
-    /** provides a mapping from <atom>string<atom> to <atom>string<atom>
-
-        <p>
-        Order of given and their returned corresponding strings is important.
-        Don't pack or optimize it. Every item of [in] list must match
-        to an item of [out] list.
-        </p>
-     */
-    interface com::sun::star::util::XStringMapping;
-};
+    : com::sun::star::util::XStringMapping;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/graphic/GraphicProvider.idl b/offapi/com/sun/star/graphic/GraphicProvider.idl
index 1bc601765d15..4d40d2aa9331 100644
--- a/offapi/com/sun/star/graphic/GraphicProvider.idl
+++ b/offapi/com/sun/star/graphic/GraphicProvider.idl
@@ -44,10 +44,7 @@ module com { module sun { module star { module graphic
 
     @see XGraphicProvider
 */
-published service GraphicProvider
-{
-    interface ::com::sun::star::graphic::XGraphicProvider;
-};
+published service GraphicProvider : XGraphicProvider;
 
 } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
index bed70ba799a0..29b238688f39 100644
--- a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
@@ -41,16 +41,10 @@
 
 /** Allow to discover Mozilla/Thunderbird profiles
     Allow init Mozilla XPCOM using selected profile and switch profiles.
- */
-published service MozillaBootstrap
-{
-    //-------------------------------------------------------------------------
-
-    /** @see XMozillaBootstrap
-     */
-    interface XMozillaBootstrap;
 
-};
+    @see XMozillaBootstrap
+ */
+published service MozillaBootstrap : XMozillaBootstrap;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/plugin/PluginManager.idl b/offapi/com/sun/star/plugin/PluginManager.idl
index cecad6627cb2..d617fe001623 100644
--- a/offapi/com/sun/star/plugin/PluginManager.idl
+++ b/offapi/com/sun/star/plugin/PluginManager.idl
@@ -39,10 +39,7 @@
 
 /** This service manages all recognized Netscape plugins.
 */
-published service PluginManager
-{
-    interface com::sun::star::plugin::XPluginManager;
-};
+published service PluginManager : XPluginManager;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/scanner/ScannerManager.idl b/offapi/com/sun/star/scanner/ScannerManager.idl
index d3b69b878c0e..f2965b295264 100644
--- a/offapi/com/sun/star/scanner/ScannerManager.idl
+++ b/offapi/com/sun/star/scanner/ScannerManager.idl
@@ -45,11 +45,7 @@ module com { module sun { module star { module scanner {
     Note that implementations should actually implement
     <type>XScannerManager2</type>.
 */
-published service ScannerManager
-{
-    interface com::sun::star::scanner::XScannerManager;
-
-};
+published service ScannerManager : XScannerManager;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/RecentFunctions.idl b/offapi/com/sun/star/sheet/RecentFunctions.idl
index 9bb5a3703d36..59bc17e5142c 100644
--- a/offapi/com/sun/star/sheet/RecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/RecentFunctions.idl
@@ -39,15 +39,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** contains the list of recently used spreadsheet functions.
  */
-published service RecentFunctions
-{
-    //-------------------------------------------------------------------------
-
-    /** provides access to the list of recently used spreadsheet functions.
-     */
-    interface com::sun::star::sheet::XRecentFunctions;
-
-};
+published service RecentFunctions : XRecentFunctions;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/JobExecutor.idl b/offapi/com/sun/star/task/JobExecutor.idl
index 23d218a15ee0..52baf581cc8d 100644
--- a/offapi/com/sun/star/task/JobExecutor.idl
+++ b/offapi/com/sun/star/task/JobExecutor.idl
@@ -49,13 +49,7 @@ module com { module sun { module star { module task {
     @see Job
     @see AsyncJob
  */
-published service JobExecutor
-{
-    //------------------------------------------------------------------------
-    /** start and regulate execution.
-     */
-    interface com::sun::star::task::XJobExecutor;
-};
+published service JobExecutor : XJobExecutor;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/text/DefaultNumberingProvider.idl b/offapi/com/sun/star/text/DefaultNumberingProvider.idl
index 5aac3d4d8325..33f77dca541b 100644
--- a/offapi/com/sun/star/text/DefaultNumberingProvider.idl
+++ b/offapi/com/sun/star/text/DefaultNumberingProvider.idl
@@ -39,10 +39,7 @@
 /** provides access to language dependent numbering types and supports
     formatting of those numberings.
  */
-published service DefaultNumberingProvider
-{
-        interface com::sun::star::text::XDefaultNumberingProvider;
-};
+published service DefaultNumberingProvider : XDefaultNumberingProvider;
 
 //=============================================================================
 }; }; }; };
diff --git a/offapi/com/sun/star/ucb/AnyCompareFactory.idl b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
index 410b2b1921ae..94a4d8ee7158 100644
--- a/offapi/com/sun/star/ucb/AnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
@@ -39,15 +39,7 @@ module com { module sun { module star { module ucb {
 
     @since OOo 1.1.2
 */
-published service AnyCompareFactory
-{
-    //-------------------------------------------------------------------------
-    /** a factory to get implementations of interface
-        <type>XAnyCompare</type>.
-     */
-    interface com::sun::star::ucb::XAnyCompareFactory;
-
-};
+published service AnyCompareFactory : XAnyCompareFactory;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
index 0f817024cd30..249c58a8416c 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
@@ -38,14 +38,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** is a factory for <type>CachedContentResultSet</type> implementations.
 */
-published service CachedContentResultSetFactory
-{
-    //-------------------------------------------------------------------------
-    /** a factory for implementations of service
-        <type>CachedContentResultSet</type>.
-     */
-    interface com::sun::star::ucb::XCachedContentResultSetFactory;
-};
+published service CachedContentResultSetFactory : XCachedContentResultSetFactory;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
index d85c16c90b3b..b1b9ccad5541 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
@@ -39,13 +39,7 @@ module com { module sun { module star { module ucb {
 /** is a factory for <type>CachedContentResultSetStub</type> implementations.
 */
 published service CachedContentResultSetStubFactory
-{
-    //-------------------------------------------------------------------------
-    /** a factory for implementations of service
-        <type>CachedContentResultSetStub</type>.
-     */
-    interface com::sun::star::ucb::XCachedContentResultSetStubFactory;
-};
+    : XCachedContentResultSetStubFactory;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
index 48e9563f77b5..67d5771926b9 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
@@ -39,13 +39,7 @@ module com { module sun { module star { module ucb {
 /** is a factory for <type>CachedDynamicResultSet</type> implementations.
 */
 published service CachedDynamicResultSetFactory
-{
-    //-------------------------------------------------------------------------
-    /** a factory for implementations of service
-        <type>CachedDynamicResultSet</type>.
-     */
-    interface com::sun::star::ucb::XCachedDynamicResultSetFactory;
-};
+    : XCachedDynamicResultSetFactory;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
index 199e2c639c83..8a1d60c44880 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
@@ -39,13 +39,7 @@ module com { module sun { module star { module ucb {
 /** is a factory for <type>CachedDynamicResultSetStub</type> implementations.
 */
 published service CachedDynamicResultSetStubFactory
-{
-    //-------------------------------------------------------------------------
-    /** a factory for implementations of service
-        <type>CachedDynamicResultSetStub</type>.
-     */
-    interface com::sun::star::ucb::XCachedDynamicResultSetStubFactory;
-};
+    : XCachedDynamicResultSetStubFactory;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
index dd1f0abcaffd..64c78d409f61 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
@@ -37,14 +37,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** is a factory for <type>ContentProviderProxy</type> implementations.
 */
-published service ContentProviderProxyFactory
-{
-    //-------------------------------------------------------------------------
-    /** a factory for implementations of service
-        <type>ContentProviderProxy</type>.
-     */
-    interface com::sun::star::ucb::XContentProviderFactory;
-};
+published service ContentProviderProxyFactory : XContentProviderFactory;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PropertiesManager.idl b/offapi/com/sun/star/ucb/PropertiesManager.idl
index fe33e2989c78..53a4db95b7a6 100644
--- a/offapi/com/sun/star/ucb/PropertiesManager.idl
+++ b/offapi/com/sun/star/ucb/PropertiesManager.idl
@@ -43,13 +43,7 @@ module com { module sun { module star { module ucb {
     @see com::sun::star::ucb::Content
 */
 published service PropertiesManager
-{
-    //-------------------------------------------------------------------------
-    /** This interface provides access to the meta data of the well known
-        (predefined) UCB properties.
-     */
-    interface com::sun::star::beans::XPropertySetInfo;
-};
+    : com::sun::star::beans::XPropertySetInfo;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/SimpleFileAccess.idl b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
index 629a8c89136c..894e4f99bb58 100644
--- a/offapi/com/sun/star/ucb/SimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
@@ -42,11 +42,7 @@ local file system or on an WebDAV server.
     @author Andreas Bregas
     @version 1.0 07/25/2000
 */
-published service SimpleFileAccess
-{
-    interface com::sun::star::ucb::XSimpleFileAccess2;
-
-};
+published service SimpleFileAccess : XSimpleFileAccess2;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
index b371fb8421b6..b13a12465933 100644
--- a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
@@ -39,14 +39,7 @@ module com { module sun { module star { module ucb {
     will be sorted according to the given sorting options.
 */
 published service SortedDynamicResultSetFactory
-{
-    //-------------------------------------------------------------------------
-    /** a factory for implementations of service
-        <type>DynamicResultSet</type>.
-     */
-    interface com::sun::star::ucb::XSortedDynamicResultSetFactory;
-
-};
+    : XSortedDynamicResultSetFactory;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/Store.idl b/offapi/com/sun/star/ucb/Store.idl
index cc6a84a94905..fc3ca25d4c25 100644
--- a/offapi/com/sun/star/ucb/Store.idl
+++ b/offapi/com/sun/star/ucb/Store.idl
@@ -37,14 +37,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** creates instances of the service <type>PropertySetRegistry</type>.
   */
-published service Store
-{
-    //-------------------------------------------------------------------------
-    /** A factory for property set registries. This factory must create
-        instances of the service <type>PropertySetRegistry</type>
-     */
-    interface com::sun::star::ucb::XPropertySetRegistryFactory;
-};
+published service Store : XPropertySetRegistryFactory;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index 5f2b2fd51692..aa397880977a 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -88,17 +88,7 @@ module com {  module sun {  module star {  module  util {
     @since OOo 1.1.2
 */
 
-published service PathSubstitution
-{
-        //-------------------------------------------------------------------------
-        /** Interface to exchange path variables with defined paths and to resubstitute paths with path variables.
-
-                <p>
-                To resubstitute path variables the caller must provide paths as UCB-compliant URLs.
-                </p>
-        */
-        interface com::sun::star::util::XStringSubstitution;
-};
+published service PathSubstitution : XStringSubstitution;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/TextSearch.idl b/offapi/com/sun/star/util/TextSearch.idl
index 93ea847983af..94ac3d54e82f 100644
--- a/offapi/com/sun/star/util/TextSearch.idl
+++ b/offapi/com/sun/star/util/TextSearch.idl
@@ -40,10 +40,7 @@ module com {  module sun {  module star {  module util {
 
     <p>It is possible to search forward or backward in the string.
 */
-published service TextSearch
-{
-    interface com::sun::star::util::XTextSearch;
-};
+published service TextSearch : XTextSearch;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/URLTransformer.idl b/offapi/com/sun/star/util/URLTransformer.idl
index 7914c6825c75..a03929643d62 100644
--- a/offapi/com/sun/star/util/URLTransformer.idl
+++ b/offapi/com/sun/star/util/URLTransformer.idl
@@ -40,11 +40,7 @@ module com {  module sun {  module star {  module util {
 /** helps to split up a string containing a URL into its
     structural parts and assembles the parts into a single string.
  */
-published service URLTransformer
-{
-    interface com::sun::star::util::XURLTransformer;
-
-};
+published service URLTransformer : XURLTransformer;
 
 //=============================================================================
 
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 8e35e759b2b4..936c5c61c4d1 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb