diff options
| author | Noel Grandin <noel@peralex.com> | 2013-06-05 13:30:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-06-10 10:20:44 +0200 |
| commit | 670e2329df5cccaacd0e43d3656aeb112488e8ef (patch) | |
| tree | aad439837c3d5e1770aa0c42314c18ca772dbdf4 /offapi | |
| parent | 2c64af529567324f4433984ed7673304d26062c8 (diff) | |
fdo#46808, Convert xml::crypto services to new style
Also remove the unnecessary XInitialization implementations.
Change-Id: I81f32b2cdcf69b84fe4b15382f9294073a7f2f20
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 4 | ||||
| -rw-r--r-- | offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl | 14 | ||||
| -rw-r--r-- | offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl | 12 |
3 files changed, 8 insertions, 22 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1342d3f12fe2..081a0d3c799a 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -451,8 +451,10 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xforms,\ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/crypto,\ NSSInitializer \ + SecurityEnvironment \ SEInitializer \ XMLEncryptionTemplate \ + XMLSecurityContext \ XMLSignatureTemplate \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/dom,\ @@ -1583,9 +1585,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\ XMLImportFilter \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\ - SecurityEnvironment \ XMLEncryption \ - XMLSecurityContext \ XMLSignature \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\ 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; } ; } ; } ; } ; } ; |