diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 12:19:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 14:25:02 +0100 |
| commit | ddd43218e9900536381733735adf8681d345e775 (patch) | |
| tree | 5bb211e63d9b739d20eb248f1ab9f0fb481e118d /oox | |
| parent | 9c036b1d3db253a1fd43ce76ce1d919e2029af59 (diff) | |
drop sax::tools::*base64 methods
and use the underlying comphelper methods rather. This is so that I can
break the dependency that tools has on sax, and can add methods that
make sax depend on tools.
Change-Id: I8a2d6ce2ffc3529a0020710ade6a1748ee5af7d5
Reviewed-on: https://gerrit.libreoffice.org/50767
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/crypto/DocumentDecryption.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index 5f5940ad01db..bd8dff7e022a 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -10,6 +10,7 @@ #include <oox/crypto/DocumentDecryption.hxx> +#include <comphelper/base64.hxx> #include <comphelper/sequenceashashmap.hxx> #include <sax/tools/converter.hxx> #include <cppuhelper/implbase.hxx> @@ -90,7 +91,7 @@ public: if (localname(rAttribute.Name) == "saltValue") { Sequence<sal_Int8> keyDataSalt; - ::sax::Converter::decodeBase64(keyDataSalt, rAttribute.Value); + ::comphelper::Base64::decode(keyDataSalt, rAttribute.Value); mInfo.keyDataSalt = convertToVector(keyDataSalt); } } @@ -135,25 +136,25 @@ public: else if (rAttrLocalName == "saltValue") { Sequence<sal_Int8> saltValue; - ::sax::Converter::decodeBase64(saltValue, rAttribute.Value); + ::comphelper::Base64::decode(saltValue, rAttribute.Value); mInfo.saltValue = convertToVector(saltValue); } else if (rAttrLocalName == "encryptedVerifierHashInput") { Sequence<sal_Int8> encryptedVerifierHashInput; - ::sax::Converter::decodeBase64(encryptedVerifierHashInput, rAttribute.Value); + ::comphelper::Base64::decode(encryptedVerifierHashInput, rAttribute.Value); mInfo.encryptedVerifierHashInput = convertToVector(encryptedVerifierHashInput); } else if (rAttrLocalName == "encryptedVerifierHashValue") { Sequence<sal_Int8> encryptedVerifierHashValue; - ::sax::Converter::decodeBase64(encryptedVerifierHashValue, rAttribute.Value); + ::comphelper::Base64::decode(encryptedVerifierHashValue, rAttribute.Value); mInfo.encryptedVerifierHashValue = convertToVector(encryptedVerifierHashValue); } else if (rAttrLocalName == "encryptedKeyValue") { Sequence<sal_Int8> encryptedKeyValue; - ::sax::Converter::decodeBase64(encryptedKeyValue, rAttribute.Value); + ::comphelper::Base64::decode(encryptedKeyValue, rAttribute.Value); mInfo.encryptedKeyValue = convertToVector(encryptedKeyValue); } } |