diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-12 10:45:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-12-12 10:46:23 +0200 |
| commit | aa2f02a4dc8a05f49e679a26f2beebb9d66b2325 (patch) | |
| tree | bed0e3b1b000fceaf09552bc703d19a236de7bbc /oox/source/crypto/DocumentDecryption.cxx | |
| parent | df46ec0580b625efe8bd747bed54bc4d4d71f073 (diff) | |
remove operator>> and operator<< methods
in favour of ReadXXX/WriteXXX methods
Change-Id: I69eebee3a8ce5b40301db7940a1d85915c0bf6f4
Diffstat (limited to 'oox/source/crypto/DocumentDecryption.cxx')
| -rw-r--r-- | oox/source/crypto/DocumentDecryption.cxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index 50a886875c11..fc93e0b46a31 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -264,33 +264,32 @@ bool DocumentDecryption::readStandard2007EncryptionInfo(BinaryInputStream& rStre mEngine.reset(engine); StandardEncryptionInfo& info = engine->getInfo(); - rStream >> info.header.flags; + info.header.flags = rStream.readuInt32(); if( getFlag( info.header.flags, ENCRYPTINFO_EXTERNAL ) ) return false; - sal_uInt32 nHeaderSize; - rStream >> nHeaderSize; + sal_uInt32 nHeaderSize = rStream.readuInt32(); sal_uInt32 actualHeaderSize = sizeof(info.header); if( (nHeaderSize < actualHeaderSize) ) return false; - rStream >> info.header.flags; - rStream >> info.header.sizeExtra; - rStream >> info.header.algId; - rStream >> info.header.algIdHash; - rStream >> info.header.keyBits; - rStream >> info.header.providedType; - rStream >> info.header.reserved1; - rStream >> info.header.reserved2; + info.header.flags = rStream.readuInt32(); + info.header.sizeExtra = rStream.readuInt32(); + info.header.algId = rStream.readuInt32(); + info.header.algIdHash = rStream.readuInt32(); + info.header.keyBits = rStream.readuInt32(); + info.header.providedType = rStream.readuInt32(); + info.header.reserved1 = rStream.readuInt32(); + info.header.reserved2 = rStream.readuInt32(); rStream.skip( nHeaderSize - actualHeaderSize ); - rStream >> info.verifier.saltSize; + info.verifier.saltSize = rStream.readuInt32(); rStream.readArray(info.verifier.salt, SAL_N_ELEMENTS(info.verifier.salt)); rStream.readArray(info.verifier.encryptedVerifier, SAL_N_ELEMENTS(info.verifier.encryptedVerifier)); - rStream >> info.verifier.encryptedVerifierHashSize; + info.verifier.encryptedVerifierHashSize = rStream.readuInt32(); rStream.readArray(info.verifier.encryptedVerifierHash, SAL_N_ELEMENTS(info.verifier.encryptedVerifierHash)); if( info.verifier.saltSize != 16 ) |