From e4d9dabce80e7823bcdf28f06a99c83a2950d8c7 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 26 Mar 2012 15:05:46 +0200
Subject: fdo#46808, Adapt UNO serviecs to new style, Part 1

Convert the IDL files in the udkapi module, and update the
types.rdb database.

Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
---
 udkapi/com/sun/star/beans/Introspection.idl                 | 7 +------
 udkapi/com/sun/star/registry/ImplementationRegistration.idl | 6 +-----
 udkapi/com/sun/star/registry/SimpleRegistry.idl             | 7 +------
 udkapi/com/sun/star/script/AllListenerAdapter.idl           | 5 +----
 udkapi/com/sun/star/script/Invocation.idl                   | 7 +------
 udkapi/com/sun/star/security/AccessController.idl           | 5 +----
 udkapi/com/sun/star/security/Policy.idl                     | 5 +----
 udkapi/com/sun/star/uno/NamingService.idl                   | 9 ++-------
 8 files changed, 9 insertions(+), 42 deletions(-)

(limited to 'udkapi/com/sun/star')

diff --git a/udkapi/com/sun/star/beans/Introspection.idl b/udkapi/com/sun/star/beans/Introspection.idl
index 0e93138eb646..1f6d011d992f 100644
--- a/udkapi/com/sun/star/beans/Introspection.idl
+++ b/udkapi/com/sun/star/beans/Introspection.idl
@@ -45,12 +45,7 @@
     <p>For details see method <member>XIntrospection::inspect
     </member>.</p>
  */
-published service Introspection
-{
-    /// The only interface of this service
-    interface com::sun::star::beans::XIntrospection;
-
-};
+published service Introspection : com::sun::star::beans::XIntrospection;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/registry/ImplementationRegistration.idl b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
index 03a365e7d54c..f925a2a10141 100644
--- a/udkapi/com/sun/star/registry/ImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
@@ -49,11 +49,7 @@
     </ul>
  */
 published service ImplementationRegistration
-{
-    // DocMerge: empty anyway
-    interface com::sun::star::registry::XImplementationRegistration;
-
-};
+  : com::sun::star::registry::XImplementationRegistration;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/registry/SimpleRegistry.idl b/udkapi/com/sun/star/registry/SimpleRegistry.idl
index b4b8e5ab87b3..fbe06d99a0f3 100644
--- a/udkapi/com/sun/star/registry/SimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/SimpleRegistry.idl
@@ -46,12 +46,7 @@
     <li>-thread safe</li>
     </ul>
  */
-published service SimpleRegistry
-{
-    // DocMerge: empty anyway
-    interface com::sun::star::registry::XSimpleRegistry;
-
-};
+published service SimpleRegistry : com::sun::star::registry::XSimpleRegistry;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/AllListenerAdapter.idl b/udkapi/com/sun/star/script/AllListenerAdapter.idl
index b98db50ea244..f454c1247ad8 100644
--- a/udkapi/com/sun/star/script/AllListenerAdapter.idl
+++ b/udkapi/com/sun/star/script/AllListenerAdapter.idl
@@ -40,10 +40,7 @@
     interfaces to the interface <type>XAllListener</type>.
  */
 published service AllListenerAdapter
-{
-    /// interface to create adapters for listener types
-    interface com::sun::star::script::XAllListenerAdapterService;
-};
+    : com::sun::star::script::XAllListenerAdapterService;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/Invocation.idl b/udkapi/com/sun/star/script/Invocation.idl
index 92ef143a833b..a72f7a6e4f49 100644
--- a/udkapi/com/sun/star/script/Invocation.idl
+++ b/udkapi/com/sun/star/script/Invocation.idl
@@ -46,12 +46,7 @@
     The adapter may also support <type scope="com::sun::star::script">XInvocation2</type>.
     </p>
  */
-published service Invocation
-{
-    /// Interface to specify the object to be mapped by the invocation service.
-    interface com::sun::star::lang::XSingleServiceFactory;
-
-};
+published service Invocation : com::sun::star::lang::XSingleServiceFactory;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/security/AccessController.idl b/udkapi/com/sun/star/security/AccessController.idl
index 7748489f01b9..3ee1b8b06e13 100644
--- a/udkapi/com/sun/star/security/AccessController.idl
+++ b/udkapi/com/sun/star/security/AccessController.idl
@@ -51,10 +51,7 @@ module com {  module sun {  module star {  module security {
 
     @since OOo 1.1.2
 */
-published service AccessController
-{
-    interface XAccessController;
-};
+published service AccessController : XAccessController;
 
 }; }; }; };
 
diff --git a/udkapi/com/sun/star/security/Policy.idl b/udkapi/com/sun/star/security/Policy.idl
index e0894f09aace..045d2dbb3fe2 100644
--- a/udkapi/com/sun/star/security/Policy.idl
+++ b/udkapi/com/sun/star/security/Policy.idl
@@ -37,10 +37,7 @@ module com {  module sun {  module star {  module security {
 
     @since OOo 1.1.2
 */
-published service Policy
-{
-    interface XPolicy;
-};
+published service Policy : XPolicy;
 
 }; }; }; };
 
diff --git a/udkapi/com/sun/star/uno/NamingService.idl b/udkapi/com/sun/star/uno/NamingService.idl
index fd0390405db4..38b7239c1c54 100644
--- a/udkapi/com/sun/star/uno/NamingService.idl
+++ b/udkapi/com/sun/star/uno/NamingService.idl
@@ -34,14 +34,9 @@
 
 //=============================================================================
 /** a simple named object container.
-
+    Through this interface the objects are registered and accessed.
  */
-published service NamingService
-{
-    /** through this interface the objects are registered and accessed.
-     */
-    interface com::sun::star::uno::XNamingService;
-};
+published service NamingService : com::sun::star::uno::XNamingService;
 
 //=============================================================================
 
-- 
cgit