INTEGRATION: CWS xmlsec06 (1.1.1.1.2); FILE MERGED

2004/10/12 08:30:54 mmi 1.1.1.1.2.1: add error detail information
Issue number:
Submitted by:
Reviewed by:

xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlencryption_nssimpl.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mt $ $Date: 2004-07-12 13:15:21 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 14:59:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,7 +130,7 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper3<
             throw ( com::sun::star::xml::crypto::XMLEncryptionException ,
                     com::sun::star::uno::SecurityException);
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL decrypt(
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
         ) throw( com::sun::star::xml::crypto::XMLEncryptionException ,

xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlsignature_nssimpl.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mt $ $Date: 2004-07-12 13:15:21 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 14:59:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -129,7 +129,7 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper3<
         ) throw( com::sun::star::xml::crypto::XMLSignatureException,
                  com::sun::star::uno::SecurityException) ;
 
-        virtual sal_Bool SAL_CALL validate(
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
         ) throw( com::sun::star::uno::RuntimeException,