diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-11 13:55:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-13 08:35:16 +0200 |
| commit | 67649406d7b72f8d6ea4bbe76e775e0052ddefc3 (patch) | |
| tree | 3cf40f61c1e30a1cba78ba21c7d2e6ac3d274694 /oox | |
| parent | e7cc6b253f5a1fd1205da231f6a14011501ed74e (diff) | |
loplugin:returnconstant in oox,package
Change-Id: I1dade7ddde6b1e226861d32f24f65be5bb9d9352
Reviewed-on: https://gerrit.libreoffice.org/58880
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/crypto/AgileEngine.cxx | 4 | ||||
| -rw-r--r-- | oox/source/ole/axbinarywriter.cxx | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx index 80c233d95655..54a8d952c66d 100644 --- a/oox/source/crypto/AgileEngine.cxx +++ b/oox/source/crypto/AgileEngine.cxx @@ -331,7 +331,7 @@ bool AgileEngine::decryptAndCheckVerifierHash(OUString const & rPassword) return (hash.size() <= hashValue.size() && std::equal(hash.begin(), hash.end(), hashValue.begin())); } -bool AgileEngine::decryptEncryptionKey(OUString const & rPassword) +void AgileEngine::decryptEncryptionKey(OUString const & rPassword) { sal_Int32 nKeySize = mInfo.keyBits / 8; @@ -342,8 +342,6 @@ bool AgileEngine::decryptEncryptionKey(OUString const & rPassword) calculateHashFinal(rPassword, aPasswordHash); calculateBlock(constBlock3, aPasswordHash, mInfo.encryptedKeyValue, mKey); - - return true; } // TODO: Rename diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx index b532527923ab..d0e0c556e975 100644 --- a/oox/source/ole/axbinarywriter.cxx +++ b/oox/source/ole/axbinarywriter.cxx @@ -138,8 +138,8 @@ void AxBinaryPropertyWriter::writeBoolProperty( bool orbValue ) void AxBinaryPropertyWriter::writePairProperty( AxPairData& orPairData ) { - if( startNextProperty() ) - maLargeProps.push_back( ComplexPropVector::value_type( new PairProperty( orPairData ) ) ); + startNextProperty(); + maLargeProps.push_back( ComplexPropVector::value_type( new PairProperty( orPairData ) ) ); } void AxBinaryPropertyWriter::writeStringProperty( OUString& orValue ) @@ -198,12 +198,11 @@ bool AxBinaryPropertyWriter::ensureValid() return mbValid; } -bool AxBinaryPropertyWriter::startNextProperty( bool bSkip ) +void AxBinaryPropertyWriter::startNextProperty( bool bSkip ) { // if we are skipping then we clear the flag setFlag( mnPropFlags, mnNextProp, !bSkip ); mnNextProp <<= 1; - return true; } } // namespace exp |