[Libreoffice-commits] .: cui/source xmlsecurity/source
J Graeme Lingard
jgraeme at kemper.freedesktop.org
Sat Mar 5 08:48:45 PST 2011
cui/source/options/optinet2.cxx | 2 -
cui/source/options/optinet2.hxx | 5 +--
cui/source/options/optinet2.src | 4 ---
cui/source/options/treeopt.cxx | 2 -
xmlsecurity/source/dialogs/resourcemanager.cxx | 2 -
xmlsecurity/source/dialogs/warnings.cxx | 2 -
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 10 ++-----
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 13 +---------
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2 -
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 7 -----
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 3 --
11 files changed, 11 insertions(+), 41 deletions(-)
New commits:
commit 019bb4b6486d9767f6d91bb971d27d1c1504fcde
Author: J. Graeme Lingard <jgraeme+git at gmail.com>
Date: Sat Mar 5 16:45:26 2011 +0000
Remove 'added by' comments
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index cb5a63d..7176087 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -1532,7 +1532,6 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& )
}
}
-//added by jmeng begin
MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
: SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ),
@@ -1722,7 +1721,6 @@ BOOL MozPluginTabPage::uninstallPlugin()
return false;
#endif
}
-//added by jmeng end
/* -------------------------------------------------------------------------*/
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index da8d1c2..48ecf86 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -200,7 +200,7 @@ private:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
- BOOL ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
+ BOOL ConfirmLeave( const String& rStringSelection );
SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxSearchTabPage();
@@ -278,7 +278,6 @@ public:
virtual void Reset( const SfxItemSet& rSet );
};
-//added by jmeng begin
class MozPluginTabPage : public SfxTabPage
{
FixedLine aMSWordGB;
@@ -300,7 +299,7 @@ public:
virtual void Reset( const SfxItemSet& rSet );
};
-//added by jmeng end
+
#endif
#ifdef WNT
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 848cdc2..4e4543c 100755
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -37,8 +37,6 @@
/* */
/************************************************************************/
-// added by jmeng begin
-
TabPage RID_SVXPAGE_INET_MOZPLUGIN
{
OutputSize = TRUE ;
@@ -61,8 +59,6 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN
};
};
-//added by jmeng end
-
TabPage RID_SVXPAGE_INET_PROXY
{
HelpId = HID_OPTIONS_PROXY ;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f7f22d3..e483e1c 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -359,9 +359,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem
case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break;
case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break;
- //added by jmeng begin
case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break;
- //added by jmeng end
case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break;
case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break;
case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break;
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 9cf217e..3389b34 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 be836a9..436eebb 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 96c8276..e02534e 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 3ee12fa..47cd492 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 f01ec8d..740d28e 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 b310b80..71a0221 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 b4e1a52..3e89ef9 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() ;
More information about the Libreoffice-commits
mailing list