diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-15 11:06:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-16 09:04:08 +0100 |
| commit | 0a9fa3d840da1ba224397fddd6a09852d7121701 (patch) | |
| tree | 7712687d35e8504cc9535814458feea8b082a12f /package | |
| parent | 2b4d91f5a3738e0b71583769b3a69d6a6211d7ca (diff) | |
ditch some junk
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/manifest/ManifestDefines.hxx | 5 | ||||
| -rw-r--r-- | package/source/manifest/ManifestImport.cxx | 3 | ||||
| -rw-r--r-- | package/source/manifest/ManifestImport.hxx | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/package/source/manifest/ManifestDefines.hxx b/package/source/manifest/ManifestDefines.hxx index 4d8d9f0cbef0..969f4d834835 100644 --- a/package/source/manifest/ManifestDefines.hxx +++ b/package/source/manifest/ManifestDefines.hxx @@ -61,10 +61,7 @@ #define ATTRIBUTE_SALT "manifest:salt" #define ATTRIBUTE_ITERATION_COUNT "manifest:iteration-count" -#define SHA256_URL "http://www.w3.org/2001/04/xmlenc#sha256" -//http://tools.oasis-open.org/issues/browse/OFFICE-3702 -//http://tools.oasis-open.org/issues/browse/OFFICE-3708 -#define SHA256_URL_TYPO "http://www.w3.org/2000/09/xmldsig#sha256" +#define SHA256_URL "http://www.w3.org/2000/09/xmldsig#sha256" #define SHA1_NAME "SHA1" #define SHA1_URL "http://www.w3.org/2000/09/xmldsig#sha1" diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 902f5b58ed98..f685f7ea87fb 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -88,7 +88,6 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV , sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) ) , sSHA256_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL ) ) -, sSHA256_URL_TYPO ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL_TYPO ) ) , sSHA1_Name ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_NAME ) ) , sSHA1_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_URL ) ) @@ -282,7 +281,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re else if ( aConvertedName == sStartKeyAlgElement ) { OUString aString = aConvertedAttribs[sStartKeyAlgNameAttribute]; - if (aString.equals(sSHA256_URL) || aString.equals(sSHA256_URL_TYPO)) + if ( aString.equals( sSHA256_URL ) ) { aSequence[nNumProperty].Name = sStartKeyAlgProperty; aSequence[nNumProperty++].Value <<= xml::crypto::DigestID::SHA256; diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 5d67206c6709..1c646a7952a6 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -106,7 +106,6 @@ protected: const ::rtl::OUString sWhiteSpace; const ::rtl::OUString sSHA256_URL; - const ::rtl::OUString sSHA256_URL_TYPO; const ::rtl::OUString sSHA1_Name; const ::rtl::OUString sSHA1_URL; |