From ed1952aacdd021368e6bb22e66f6499676cc4569 Mon Sep 17 00:00:00 2001
From: Daniel Rentz <dr@openoffice.org>
Date: Thu, 15 Jul 2010 13:58:09 +0200
Subject: dr77: #i113097# 'NULL' is not a shortcut for empty UNO sequences

---
 .../xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx     |  2 +-
 .../source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'xmlsecurity/source/xmlsec')

diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 71ff13fb3f82..d4bc76e627b5 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -895,7 +895,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: buildC
     if (pChainContext)
         CertFreeCertificateChain(pChainContext);
 
-    return NULL ;
+    return Sequence< Reference < XCertificate > >();
 }
 
 Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException ) {
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 8f983dae05de..85478f8a4621 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -206,7 +206,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
 
         return serial ;
     } else {
-        return NULL ;
+        return Sequence< sal_Int8 >();
     }
 }
 
@@ -367,7 +367,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
 
         return issuerUid ;
     } else {
-        return NULL ;
+        return Sequence< sal_Int8 >();
     }
 }
 
@@ -379,7 +379,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
 
         return subjectUid ;
     } else {
-        return NULL ;
+        return Sequence< sal_Int8 >();
     }
 }
 
@@ -403,7 +403,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
 
         return xExtns ;
     } else {
-        return NULL ;
+        return Sequence< Reference< XCertificateExtension > >();
     }
 }
 
@@ -443,7 +443,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
 
         return rawCert ;
     } else {
-        return NULL ;
+        return Sequence< sal_Int8 >();
     }
 }
 
@@ -548,7 +548,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
         }
     }
 
-    return NULL;
+    return Sequence< sal_Int8 >();
 }
 
 ::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
@@ -582,7 +582,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
     }
     else
     {
-        return NULL ;
+        return Sequence< sal_Int8 >();
     }
 }
 
-- 
cgit