From 670e2329df5cccaacd0e43d3656aeb112488e8ef Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 5 Jun 2013 13:30:21 +0200
Subject: fdo#46808, Convert xml::crypto services to new style

Also remove the unnecessary XInitialization implementations.

Change-Id: I81f32b2cdcf69b84fe4b15382f9294073a7f2f20
---
 offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl | 14 +++-----------
 offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl  | 12 +++---------
 2 files changed, 6 insertions(+), 20 deletions(-)

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

diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index 18d12a9b11ce..b73e838ac192 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -21,25 +21,17 @@
 
 /** -- idl definition -- **/
 
-#ifndef __com_sun_star_xml_crypto_securityenvironment_idl_
-#define __com_sun_star_xml_crypto_securityenvironment_idl_
+#ifndef __com_sun_star_xml_crypto_SecurityEnvironment_idl_
+#define __com_sun_star_xml_crypto_SecurityEnvironment_idl_
 
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
-#include <com/sun/star/lang/XUnoTunnel.idl>
-#include <com/sun/star/lang/XInitialization.idl>
 
 module com { module sun { module star { module xml { module crypto {
 
 /**
  * Service of XSecurityEnvironment
  */
-service SecurityEnvironment {
-    interface com::sun::star::xml::crypto::XSecurityEnvironment ;
-    interface com::sun::star::lang::XInitialization ;
-    interface com::sun::star::lang::XUnoTunnel;
-} ;
+service SecurityEnvironment : XSecurityEnvironment;
 
 } ; } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index 90c3211fcafb..1d841970ecb7 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -21,23 +21,17 @@
 
 /** -- idl definition -- **/
 
-#ifndef __com_sun_star_xml_crypto_xmlsecuritycontext_idl_
-#define __com_sun_star_xml_crypto_xmlsecuritycontext_idl_
+#ifndef __com_sun_star_xml_crypto_XMLSecurityContext_idl_
+#define __com_sun_star_xml_crypto_XMLSecurityContext_idl_
 
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
-#include <com/sun/star/lang/XInitialization.idl>
 
 module com { module sun { module star { module xml { module crypto {
 
 /**
  * Service of XMLSecurityContext
  */
-service XMLSecurityContext {
-    interface com::sun::star::xml::crypto::XXMLSecurityContext ;
-    interface com::sun::star::lang::XInitialization ;
-} ;
+service XMLSecurityContext : XXMLSecurityContext;
 
 } ; } ; } ; } ; } ;
 
-- 
cgit