[Libreoffice-commits] core.git: package/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 1 17:50:36 UTC 2020
package/source/manifest/ManifestImport.cxx | 142 ++++++++++++++---------------
1 file changed, 71 insertions(+), 71 deletions(-)
New commits:
commit 38cfe86259c63b0080d3f064dd0e7999d2eeee76
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 1 13:29:00 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 1 19:49:56 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: package
Change-Id: Ie183cb0d374e8d9a02891a765f46583f7cc1c345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97618
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index cc7558f3b87f..9e3508361b56 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -34,77 +34,77 @@ using namespace com::sun::star;
using namespace std;
-static const OUStringLiteral gsFileEntryElement ( ELEMENT_FILE_ENTRY );
-static const OUStringLiteral gsEncryptionDataElement( ELEMENT_ENCRYPTION_DATA );
-static const OUStringLiteral gsAlgorithmElement ( ELEMENT_ALGORITHM );
-static const OUStringLiteral gsStartKeyAlgElement ( ELEMENT_START_KEY_GENERATION );
-static const OUStringLiteral gsKeyDerivationElement( ELEMENT_KEY_DERIVATION );
-
-static const OUStringLiteral gsMediaTypeAttribute ( ATTRIBUTE_MEDIA_TYPE );
-static const OUStringLiteral gsVersionAttribute ( ATTRIBUTE_VERSION );
-static const OUStringLiteral gsFullPathAttribute ( ATTRIBUTE_FULL_PATH );
-static const OUStringLiteral gsSizeAttribute ( ATTRIBUTE_SIZE );
-static const OUStringLiteral gsSaltAttribute ( ATTRIBUTE_SALT );
-static const OUStringLiteral gsInitialisationVectorAttribute ( ATTRIBUTE_INITIALISATION_VECTOR );
-static const OUStringLiteral gsIterationCountAttribute ( ATTRIBUTE_ITERATION_COUNT );
-static const OUStringLiteral gsKeySizeAttribute ( ATTRIBUTE_KEY_SIZE );
-static const OUStringLiteral gsAlgorithmNameAttribute ( ATTRIBUTE_ALGORITHM_NAME );
-static const OUStringLiteral gsStartKeyAlgNameAttribute ( ATTRIBUTE_START_KEY_GENERATION_NAME );
-static const OUStringLiteral gsKeyDerivationNameAttribute ( ATTRIBUTE_KEY_DERIVATION_NAME );
-static const OUStringLiteral gsChecksumAttribute ( ATTRIBUTE_CHECKSUM );
-static const OUStringLiteral gsChecksumTypeAttribute ( ATTRIBUTE_CHECKSUM_TYPE );
-
-static const OUStringLiteral gsKeyInfoElement ( ELEMENT_ENCRYPTED_KEYINFO );
-static const OUStringLiteral gsManifestKeyInfoElement ( ELEMENT_MANIFEST_KEYINFO );
-static const OUStringLiteral gsEncryptedKeyElement ( ELEMENT_ENCRYPTEDKEY );
-static const OUStringLiteral gsEncryptionMethodElement ( ELEMENT_ENCRYPTIONMETHOD );
-static const OUStringLiteral gsPgpDataElement ( ELEMENT_PGPDATA );
-static const OUStringLiteral gsPgpKeyIDElement ( ELEMENT_PGPKEYID );
-static const OUStringLiteral gsPGPKeyPacketElement ( ELEMENT_PGPKEYPACKET );
-static const OUStringLiteral gsAlgorithmAttribute ( ATTRIBUTE_ALGORITHM );
-static const OUStringLiteral gsCipherDataElement ( ELEMENT_CIPHERDATA );
-static const OUStringLiteral gsCipherValueElement ( ELEMENT_CIPHERVALUE );
-
-static const OUStringLiteral gsManifestKeyInfoElement13 ( ELEMENT_MANIFEST13_KEYINFO );
-static const OUStringLiteral gsEncryptedKeyElement13 ( ELEMENT_ENCRYPTEDKEY13 );
-static const OUStringLiteral gsEncryptionMethodElement13 ( ELEMENT_ENCRYPTIONMETHOD13 );
-static const OUStringLiteral gsPgpDataElement13 ( ELEMENT_PGPDATA13 );
-static const OUStringLiteral gsPgpKeyIDElement13 ( ELEMENT_PGPKEYID13 );
-static const OUStringLiteral gsPGPKeyPacketElement13 ( ELEMENT_PGPKEYPACKET13 );
-static const OUStringLiteral gsAlgorithmAttribute13 ( ATTRIBUTE_ALGORITHM13 );
-static const OUStringLiteral gsCipherDataElement13 ( ELEMENT_CIPHERDATA13 );
-static const OUStringLiteral gsCipherValueElement13 ( ELEMENT_CIPHERVALUE13 );
-
-static const OUStringLiteral gsFullPathProperty ( "FullPath" );
-static const OUStringLiteral gsMediaTypeProperty ( "MediaType" );
-static const OUStringLiteral gsVersionProperty ( "Version" );
-static const OUStringLiteral gsIterationCountProperty ( "IterationCount" );
-static const OUStringLiteral gsDerivedKeySizeProperty ( "DerivedKeySize" );
-static const OUStringLiteral gsSaltProperty ( "Salt" );
-static const OUStringLiteral gsInitialisationVectorProperty ( "InitialisationVector" );
-static const OUStringLiteral gsSizeProperty ( "Size" );
-static const OUStringLiteral gsDigestProperty ( "Digest" );
-static const OUStringLiteral gsEncryptionAlgProperty ( "EncryptionAlgorithm" );
-static const OUStringLiteral gsStartKeyAlgProperty ( "StartKeyAlgorithm" );
-static const OUStringLiteral gsDigestAlgProperty ( "DigestAlgorithm" );
-
-static const OUStringLiteral gsSHA256_URL_ODF12 ( SHA256_URL_ODF12 );
-static const OUStringLiteral gsSHA256_URL ( SHA256_URL );
-static const OUStringLiteral gsSHA1_Name ( SHA1_NAME );
-static const OUStringLiteral gsSHA1_URL ( SHA1_URL );
-
-static const OUStringLiteral gsSHA256_1k_URL ( SHA256_1K_URL );
-static const OUStringLiteral gsSHA1_1k_Name ( SHA1_1K_NAME );
-static const OUStringLiteral gsSHA1_1k_URL ( SHA1_1K_URL );
-
-static const OUStringLiteral gsBlowfish_Name ( BLOWFISH_NAME );
-static const OUStringLiteral gsBlowfish_URL ( BLOWFISH_URL );
-static const OUStringLiteral gsAES128_URL ( AES128_URL );
-static const OUStringLiteral gsAES192_URL ( AES192_URL );
-static const OUStringLiteral gsAES256_URL ( AES256_URL );
-
-static const OUStringLiteral gsPBKDF2_Name ( PBKDF2_NAME );
-static const OUStringLiteral gsPBKDF2_URL ( PBKDF2_URL );
+const OUStringLiteral gsFileEntryElement ( ELEMENT_FILE_ENTRY );
+const OUStringLiteral gsEncryptionDataElement( ELEMENT_ENCRYPTION_DATA );
+const OUStringLiteral gsAlgorithmElement ( ELEMENT_ALGORITHM );
+const OUStringLiteral gsStartKeyAlgElement ( ELEMENT_START_KEY_GENERATION );
+const OUStringLiteral gsKeyDerivationElement( ELEMENT_KEY_DERIVATION );
+
+const OUStringLiteral gsMediaTypeAttribute ( ATTRIBUTE_MEDIA_TYPE );
+const OUStringLiteral gsVersionAttribute ( ATTRIBUTE_VERSION );
+const OUStringLiteral gsFullPathAttribute ( ATTRIBUTE_FULL_PATH );
+const OUStringLiteral gsSizeAttribute ( ATTRIBUTE_SIZE );
+const OUStringLiteral gsSaltAttribute ( ATTRIBUTE_SALT );
+const OUStringLiteral gsInitialisationVectorAttribute ( ATTRIBUTE_INITIALISATION_VECTOR );
+const OUStringLiteral gsIterationCountAttribute ( ATTRIBUTE_ITERATION_COUNT );
+const OUStringLiteral gsKeySizeAttribute ( ATTRIBUTE_KEY_SIZE );
+const OUStringLiteral gsAlgorithmNameAttribute ( ATTRIBUTE_ALGORITHM_NAME );
+const OUStringLiteral gsStartKeyAlgNameAttribute ( ATTRIBUTE_START_KEY_GENERATION_NAME );
+const OUStringLiteral gsKeyDerivationNameAttribute ( ATTRIBUTE_KEY_DERIVATION_NAME );
+const OUStringLiteral gsChecksumAttribute ( ATTRIBUTE_CHECKSUM );
+const OUStringLiteral gsChecksumTypeAttribute ( ATTRIBUTE_CHECKSUM_TYPE );
+
+const OUStringLiteral gsKeyInfoElement ( ELEMENT_ENCRYPTED_KEYINFO );
+const OUStringLiteral gsManifestKeyInfoElement ( ELEMENT_MANIFEST_KEYINFO );
+const OUStringLiteral gsEncryptedKeyElement ( ELEMENT_ENCRYPTEDKEY );
+const OUStringLiteral gsEncryptionMethodElement ( ELEMENT_ENCRYPTIONMETHOD );
+const OUStringLiteral gsPgpDataElement ( ELEMENT_PGPDATA );
+const OUStringLiteral gsPgpKeyIDElement ( ELEMENT_PGPKEYID );
+const OUStringLiteral gsPGPKeyPacketElement ( ELEMENT_PGPKEYPACKET );
+const OUStringLiteral gsAlgorithmAttribute ( ATTRIBUTE_ALGORITHM );
+const OUStringLiteral gsCipherDataElement ( ELEMENT_CIPHERDATA );
+const OUStringLiteral gsCipherValueElement ( ELEMENT_CIPHERVALUE );
+
+const OUStringLiteral gsManifestKeyInfoElement13 ( ELEMENT_MANIFEST13_KEYINFO );
+const OUStringLiteral gsEncryptedKeyElement13 ( ELEMENT_ENCRYPTEDKEY13 );
+const OUStringLiteral gsEncryptionMethodElement13 ( ELEMENT_ENCRYPTIONMETHOD13 );
+const OUStringLiteral gsPgpDataElement13 ( ELEMENT_PGPDATA13 );
+const OUStringLiteral gsPgpKeyIDElement13 ( ELEMENT_PGPKEYID13 );
+const OUStringLiteral gsPGPKeyPacketElement13 ( ELEMENT_PGPKEYPACKET13 );
+const OUStringLiteral gsAlgorithmAttribute13 ( ATTRIBUTE_ALGORITHM13 );
+const OUStringLiteral gsCipherDataElement13 ( ELEMENT_CIPHERDATA13 );
+const OUStringLiteral gsCipherValueElement13 ( ELEMENT_CIPHERVALUE13 );
+
+const OUStringLiteral gsFullPathProperty ( "FullPath" );
+const OUStringLiteral gsMediaTypeProperty ( "MediaType" );
+const OUStringLiteral gsVersionProperty ( "Version" );
+const OUStringLiteral gsIterationCountProperty ( "IterationCount" );
+const OUStringLiteral gsDerivedKeySizeProperty ( "DerivedKeySize" );
+const OUStringLiteral gsSaltProperty ( "Salt" );
+const OUStringLiteral gsInitialisationVectorProperty ( "InitialisationVector" );
+const OUStringLiteral gsSizeProperty ( "Size" );
+const OUStringLiteral gsDigestProperty ( "Digest" );
+const OUStringLiteral gsEncryptionAlgProperty ( "EncryptionAlgorithm" );
+const OUStringLiteral gsStartKeyAlgProperty ( "StartKeyAlgorithm" );
+const OUStringLiteral gsDigestAlgProperty ( "DigestAlgorithm" );
+
+const OUStringLiteral gsSHA256_URL_ODF12 ( SHA256_URL_ODF12 );
+const OUStringLiteral gsSHA256_URL ( SHA256_URL );
+const OUStringLiteral gsSHA1_Name ( SHA1_NAME );
+const OUStringLiteral gsSHA1_URL ( SHA1_URL );
+
+const OUStringLiteral gsSHA256_1k_URL ( SHA256_1K_URL );
+const OUStringLiteral gsSHA1_1k_Name ( SHA1_1K_NAME );
+const OUStringLiteral gsSHA1_1k_URL ( SHA1_1K_URL );
+
+const OUStringLiteral gsBlowfish_Name ( BLOWFISH_NAME );
+const OUStringLiteral gsBlowfish_URL ( BLOWFISH_URL );
+const OUStringLiteral gsAES128_URL ( AES128_URL );
+const OUStringLiteral gsAES192_URL ( AES192_URL );
+const OUStringLiteral gsAES256_URL ( AES256_URL );
+
+const OUStringLiteral gsPBKDF2_Name ( PBKDF2_NAME );
+const OUStringLiteral gsPBKDF2_URL ( PBKDF2_URL );
ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
: bIgnoreEncryptData ( false )
More information about the Libreoffice-commits
mailing list