diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-25 21:03:07 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-25 21:03:07 +0100 |
commit | ecea2657b023888aa5be5af41876cee03ffa9b27 (patch) | |
tree | 22be85270350090c3591857dbcf13b98465a9eb7 | |
parent | mav60: remove unnecessary assertions (diff) | |
download | core-ecea2657b023888aa5be5af41876cee03ffa9b27.tar.gz core-ecea2657b023888aa5be5af41876cee03ffa9b27.zip |
mav60: fix windows warnings
-rw-r--r-- | package/source/zipapi/ZipOutputStream.cxx | 2 | ||||
-rw-r--r-- | package/source/zipapi/blowfishcontext.cxx | 3 | ||||
-rw-r--r-- | package/source/zipapi/sha1context.cxx | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index c0523c864e89..338feb556378 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -267,7 +267,7 @@ void ZipOutputStream::doDeflate() sal_Int32 nEat = ::std::min( nLength, nDiff ); uno::Sequence< sal_Int8 > aTmpSeq( aTmpBuffer.getConstArray(), nEat ); m_xDigestContext->updateDigest( aTmpSeq ); - mnDigested = mnDigested + nEat; + mnDigested = mnDigested + static_cast< sal_Int16 >( nEat ); } uno::Sequence< sal_Int8 > aEncryptionBuffer = m_xCipherContext->convertWithCipherContext( aTmpBuffer ); diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx index bd6605e2e6e5..1739bb15cde8 100644 --- a/package/source/zipapi/blowfishcontext.cxx +++ b/package/source/zipapi/blowfishcontext.cxx @@ -25,6 +25,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_package.hxx" + #include <rtl/cipher.h> #include <rtl/ref.hxx> diff --git a/package/source/zipapi/sha1context.cxx b/package/source/zipapi/sha1context.cxx index 7a04e2c5e30f..a71f20ad6f36 100644 --- a/package/source/zipapi/sha1context.cxx +++ b/package/source/zipapi/sha1context.cxx @@ -25,6 +25,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_package.hxx" + #include <rtl/digest.h> #include <rtl/ref.hxx> |