diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-15 12:23:40 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-16 07:26:27 +0100 |
commit | a2751c0795cdac9d78f8919aab319a418b6e0bbc (patch) | |
tree | 1396e27bd0e86536b9a29f08192f3d7eaeff2c8a /package | |
parent | a04340a08c9f2a0e7208f3109fbcc97ab19fccb3 (diff) |
loplugin:staticmethods improvement
Change-Id: I8889ce8a7d2309b54454cfe4c6421282e1c6e755
Reviewed-on: https://gerrit.libreoffice.org/63434
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
-rw-r--r-- | package/source/manifest/ManifestImport.cxx | 30 | ||||
-rw-r--r-- | package/source/manifest/ManifestImport.hxx | 4 |
2 files changed, 7 insertions, 27 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 9982aae75209..7f2ef54bb293 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -150,10 +150,6 @@ void ManifestImport::doFileEntry(StringHashMap &rConvertedAttribs) } } -void ManifestImport::doKeyInfoEntry(StringHashMap &) -{ -} - void ManifestImport::doEncryptedKey(StringHashMap &) { aKeyInfoSequence.clear(); @@ -171,18 +167,6 @@ void ManifestImport::doEncryptionMethod(StringHashMap &rConvertedAttribs, } } -void ManifestImport::doEncryptedKeyInfo(StringHashMap &) -{ -} - -void ManifestImport::doEncryptedCipherData(StringHashMap &) -{ -} - -void ManifestImport::doEncryptedPgpData(StringHashMap &) -{ -} - void ManifestImport::doEncryptedCipherValue() { if ( aKeyInfoSequence.size() == 3 ) @@ -353,9 +337,9 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re if (aConvertedName == gsFileEntryElement) //manifest:file-entry doFileEntry(aConvertedAttribs); else if (aConvertedName == gsManifestKeyInfoElement) //loext:keyinfo - doKeyInfoEntry(aConvertedAttribs); + ; else if (aConvertedName == gsManifestKeyInfoElement13) //manifest:keyinfo - doKeyInfoEntry(aConvertedAttribs); + ; else aStack.back().m_bValid = false; break; @@ -393,13 +377,13 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re else if (aConvertedName == gsEncryptionMethodElement13) //manifest:encryption-method doEncryptionMethod(aConvertedAttribs, gsAlgorithmAttribute13); else if (aConvertedName == gsKeyInfoElement) //loext:KeyInfo - doEncryptedKeyInfo(aConvertedAttribs); + ; else if (aConvertedName == gsCipherDataElement) //loext:CipherData - doEncryptedCipherData(aConvertedAttribs); + ; else if (aConvertedName == gsCipherDataElement13) //manifest:CipherData - doEncryptedCipherData(aConvertedAttribs); + ; else if (aConvertedName == gsPgpDataElement13) //manifest:PGPData - doEncryptedPgpData(aConvertedAttribs); + ; else aStack.back().m_bValid = false; break; @@ -411,7 +395,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re if (!aIter->m_bValid) aStack.back().m_bValid = false; else if (aConvertedName == gsPgpDataElement) //loext:PGPData - doEncryptedPgpData(aConvertedAttribs); + ; else if (aConvertedName == gsCipherValueElement) //loext:CipherValue // ciphervalue action happens on endElement aCurrentCharacters = ""; diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 33b0637015d7..15023374bf71 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -91,12 +91,8 @@ private: void doKeyDerivation(StringHashMap &rConvertedAttribs); /// @throws css::uno::RuntimeException void doStartKeyAlg(StringHashMap &rConvertedAttribs); - void doKeyInfoEntry(StringHashMap &); void doEncryptedKey(StringHashMap &); void doEncryptionMethod(StringHashMap &, const OUString &); - void doEncryptedKeyInfo(StringHashMap &); - void doEncryptedCipherData(StringHashMap &); - void doEncryptedPgpData(StringHashMap &); void doEncryptedCipherValue(); void doEncryptedKeyId(); void doEncryptedKeyPacket(); |