diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 11:59:35 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 11:59:35 +0000 |
commit | d3d3e7f4228da1e58075a5a6bbc48a37f770ffe8 (patch) | |
tree | c6e719e7ae112c7607812925295588a5427a42ba /xmlsecurity/source/helper/xmlsignaturehelper.cxx | |
parent | 3f184187c5df7032af38fbb103bbf96314a2a94a (diff) |
INTEGRATION: CWS solsfix (1.18.14); FILE MERGED
2004/11/25 07:18:51 oj 1.18.14.1: #i37818# fix ?: operator
Diffstat (limited to 'xmlsecurity/source/helper/xmlsignaturehelper.cxx')
-rw-r--r-- | xmlsecurity/source/helper/xmlsignaturehelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index 6f3074cb9b16..e57d10f594be 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsignaturehelper.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2004-11-26 14:56:01 $ + * last change: $Author: hr $ $Date: 2004-11-27 12:59:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -455,7 +455,7 @@ SignatureInformations XMLSignatureHelper::GetSignatureInformations() const uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > XMLSignatureHelper::GetSecurityEnvironment() { - return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironment()):NULL); + return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironment()): uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >()); } /* |