Remove 'added by' comments

7 files changed, 9 insertions, 30 deletions

diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 49853dada4e5..3f6d639000c5 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -372,7 +372,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
         {
             nNum = UINT8( pSerNumSeq[ i ] );
 
-            //MM : exchange the buffer[0] and buffer[1], which make it consistent with Mozilla and Windows
+            // exchange the buffer[0] and buffer[1], which make it consistent with Mozilla and Windows
             pBuffer[ 1 ] = pHexDigs[ nNum & 0x0F ];
             nNum >>= 4;
             pBuffer[ 0 ] = pHexDigs[ nNum ];
diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx
index a5dd33ca9cca..995bb6abba8a 100644
--- a/xmlsecurity/source/dialogs/warnings.cxx
+++ b/xmlsecurity/source/dialogs/warnings.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #include <comphelper/sequence.hxx>
 
-// MM : added for password exception
+// added for password exception
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/security/NoPasswordException.hpp>
 using namespace ::com::sun::star::security;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 2e4d7465ab81..933852e1baf0 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -55,12 +55,10 @@
 #include "xmlsec/keysmngr.h"
 #include "xmlsec/mscrypto/akmngr.h"
 
-//CP : added by CP
 #include <rtl/locale.h>
 #include <osl/nlsupport.h>
 #include <osl/process.h>
 
-//CP : end
 #include <rtl/memory.h>
 
 #include "../diagnose.hxx"
@@ -502,7 +500,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: getPer
             pCertContext = CertEnumCertificatesInStore( hSystemKeyStore, pCertContext );
             while (pCertContext)
             {
-                // Add By CP for checking whether the certificate is a personal certificate or not.
+                // for checking whether the certificate is a personal certificate or not.
                 if(!(CryptAcquireCertificatePrivateKey(pCertContext,
                         CRYPT_ACQUIRE_COMPARE_KEY_FLAG,
                         NULL,
@@ -510,13 +508,12 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: getPer
                         &dwKeySpec,
                         NULL)))
                 {
-                    // Not Privatekey found. SKIP this one; By CP
+                    // Not Privatekey found. SKIP this one.
                     pCertContext = CertEnumCertificatesInStore( hSystemKeyStore, pCertContext );
                     continue;
                 }
                 // then TODO : Check the personal cert is valid or not.
 
-                // end CP
                 xcert = MswcryCertContextToXCert( pCertContext ) ;
                 if( xcert != NULL )
                     certsList.push_back( xcert ) ;
@@ -553,12 +550,11 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
     CRYPT_INTEGER_BLOB cryptSerialNumber ;
     CERT_INFO certInfo ;
 
-    // By CP , for correct encoding
+    // for correct encoding
     sal_uInt16 encoding ;
     rtl_Locale *pLocale = NULL ;
     osl_getProcessLocale( &pLocale ) ;
     encoding = osl_getTextEncodingFromLocale( pLocale ) ;
-    // CP end
 
     //Create cert info from issue and serial
     rtl::OString oissuer = rtl::OUStringToOString( issuerName , encoding ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 2b5c6e5ed5dd..ae745421c780 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -33,18 +33,13 @@
 #include "x509certificate_mscryptimpl.hxx"
 #include "certificateextension_xmlsecimpl.hxx"
 
-//MM : added by MM
 #include "oid.hxx"
-//MM : end
 
-//CP : added by CP
 #include <rtl/locale.h>
 #include <osl/nlsupport.h>
 #include <osl/process.h>
 #include <utility>
 
-//CP : end
-
 using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::security ;
 using ::rtl::OUString ;
@@ -241,15 +236,14 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
                 throw RuntimeException() ;
             }
 
-            // By CP , for correct encoding
+            // for correct encoding
             sal_uInt16 encoding ;
             rtl_Locale *pLocale = NULL ;
             osl_getProcessLocale( &pLocale ) ;
             encoding = osl_getTextEncodingFromLocale( pLocale ) ;
-            // CP end
 
             if(issuer[cbIssuer-1] == 0) cbIssuer--; //delimit the last 0x00;
-            OUString xIssuer(issuer , cbIssuer ,encoding ) ; //By CP
+            OUString xIssuer(issuer , cbIssuer ,encoding ) ;
             delete [] issuer ;
 
             return replaceTagSWithTagST(xIssuer);
@@ -510,7 +504,6 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
         return NULL ;
 }
 
-// MM : added by MM
 ::rtl::OUString findOIDDescription(char *oid)
 {
     OUString ouOID = OUString::createFromAscii( oid );
@@ -656,6 +649,4 @@ sal_Int32 SAL_CALL X509Certificate_MSCryptImpl::getCertificateUsage(  )
     return usage;
 }
 
-// MM : end
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 93beee5ba058..07038b1b4685 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -67,7 +67,7 @@
 
 #include "secerror.hxx"
 
-// MM : added for password exception
+// added for password exception
 #include <com/sun/star/security/NoPasswordException.hpp>
 namespace csss = ::com::sun::star::security;
 using namespace xmlsecurity;
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 064b2dd67026..3fe691f4acda 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -36,13 +36,9 @@
 #include "nss.h"
 #include "secder.h"
 
-//MM : added by MM
 #include "hasht.h"
 #include "secoid.h"
 #include "pk11func.h"
-//MM : end
-
-
 
 #include <sal/config.h>
 #include <rtl/uuid.h>
@@ -331,7 +327,6 @@ X509Certificate_NssImpl* X509Certificate_NssImpl :: getImplementation( const Ref
         return NULL ;
 }
 
-// MM : added by MM
 ::rtl::OUString getAlgorithmDescription(SECAlgorithmID *aid)
 {
     SECOidTag tag;
@@ -458,6 +453,4 @@ sal_Int32 SAL_CALL X509Certificate_NssImpl::getCertificateUsage(  )
     return usage;
 }
 
-// MM : end
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 600bc9010d7b..71c443b437c3 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -124,7 +124,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
         throw RuntimeException() ;
     }
 
-    //MM : Get the element to be encrypted
+    // Get the element to be encrypted
     Reference< XXMLElementWrapper > xTarget = aTemplate->getTarget() ;
     if( !xTarget.is() ) {
         throw XMLEncryptionException() ;
@@ -144,7 +144,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
     }
 
     pContent = pTarget->getNativeElement() ;
-    //MM : end
 
     if( pContent == NULL ) {
         throw XMLEncryptionException() ;