diff options
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/crypto/AgileEngine.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ole/vbaexport.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx index ef1440f5c96e..b8a791848a49 100644 --- a/oox/source/crypto/AgileEngine.cxx +++ b/oox/source/crypto/AgileEngine.cxx @@ -179,7 +179,7 @@ bool AgileEngine::decrypt(BinaryXInputStream& aInputStream, Decrypt aDecryptor(mKey, iv, AgileEngine::cryptoType(mInfo)); outputLength = aDecryptor.update(outputBuffer, inputBuffer, inputLength); - sal_uInt32 writeLength = outputLength > remaining ? remaining : outputLength; + sal_uInt32 writeLength = std::min(outputLength, remaining); aOutputStream.writeMemory(outputBuffer.data(), writeLength); remaining -= outputLength; diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx index 658f072497aa..b5a45b31c1ca 100644 --- a/oox/source/ole/vbaexport.cxx +++ b/oox/source/ole/vbaexport.cxx @@ -359,7 +359,7 @@ void VBACompression::write() std::size_t nRemainingSize = nSize; while(bStreamNotEnded) { - std::size_t nChunkSize = nRemainingSize > 4096 ? 4096 : nRemainingSize; + std::size_t nChunkSize = std::min<size_t>(nRemainingSize, 4096); VBACompressionChunk aChunk(mrCompressedStream, &pData[nSize - nRemainingSize], nChunkSize); aChunk.write(); |