From 3893b00efb752942c6517bdf21d0a2cdc8ab14ab Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 30 Mar 2012 02:29:53 +0200
Subject: 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>
---
 offapi/com/sun/star/frame/DispatchHelper.idl          | 13 +++----------
 .../com/sun/star/frame/DispatchRecorderSupplier.idl   |  8 +-------
 offapi/com/sun/star/frame/DocumentTemplates.idl       |  9 +--------
 .../com/sun/star/frame/MediaTypeDetectionHelper.idl   | 19 +++++++------------
 4 files changed, 12 insertions(+), 37 deletions(-)

(limited to 'offapi/com/sun/star/frame')

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;
 
 //=============================================================================
 
-- 
cgit