diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 17:13:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 17:13:21 +0000 |
| commit | 54564a8e3c7a4e1c298f61cee3b576ef72e01424 (patch) | |
| tree | 20c606ee71043480ab97c097338bcde08fc77d0b /xmlsecurity | |
| parent | b05a3a4a59b59963af0984b7129a0fd60a5e15f7 (diff) | |
INTEGRATION: CWS xmlsec08 (1.5.2); FILE MERGED
2005/02/06 09:32:47 mmi 1.5.2.3: chinese font displayed.
Issue number: 41071
Submitted by:
Reviewed by:
2005/01/27 05:17:47 mmi 1.5.2.2:
Issue number: i41071
Submitted by:
Reviewed by:
2005/01/27 04:46:30 mmi 1.5.2.1: chinese font displayed as squares
Issue number: 41071
Submitted by:
Reviewed by:
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 0789b8019127..9ad6c2388163 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: x509certificate_nssimpl.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2005-01-18 14:35:23 $ + * last change: $Author: vg $ $Date: 2005-03-10 18:13:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,6 @@ #include "pk11func.h" //MM : end - using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::security ; using ::rtl::OUString ; @@ -130,7 +129,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s ::rtl::OUString SAL_CALL X509Certificate_NssImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCert != NULL ) { - return OUString::createFromAscii( m_pCert->issuerName ) ; + return OUString(m_pCert->issuerName , PL_strlen(m_pCert->issuerName) , RTL_TEXTENCODING_UTF8) ; } else { return OUString() ; } @@ -138,7 +137,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s ::rtl::OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCert != NULL ) { - return OUString::createFromAscii( m_pCert->subjectName ) ; + return OUString(m_pCert->subjectName , PL_strlen(m_pCert->subjectName) , RTL_TEXTENCODING_UTF8); } else { return OUString() ; } |