[Libreoffice-commits] core.git: Branch 'feature/profilesafemode' - comphelper/source

Armin Le Grand Armin.Le.Grand at cib.de
Thu Sep 29 07:59:45 UTC 2016


 comphelper/source/misc/backupfilehelper.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ca921cdd84faa84a28071c013c94589e2f18543f
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Thu Sep 29 09:57:06 2016 +0200

    profilesafe: warnings corrected
    
    Change-Id: I7ec1c3030bc2705a7114678a4f84acdc78b88cbc

diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index bf9a669..4d89f7f 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -167,9 +167,9 @@ namespace
                                 zstream->avail_out = BACKUP_FILE_HELPER_BLOCK_SIZE;
                                 zstream->next_out = reinterpret_cast<unsigned char*>(aBuffer);
 #if !defined Z_PREFIX
-                                const sal_uInt64 nRetval(deflate(zstream.get(), nSize == nToTransfer ? Z_FINISH : Z_NO_FLUSH));
+                                const sal_Int64 nRetval(deflate(zstream.get(), nSize == nToTransfer ? Z_FINISH : Z_NO_FLUSH));
 #else
-                                const sal_uInt64 nRetval(z_deflate(zstream.get(), nSize == nToTransfer ? Z_FINISH : Z_NO_FLUSH));
+                                const sal_Int64 nRetval(z_deflate(zstream.get(), nSize == nToTransfer ? Z_FINISH : Z_NO_FLUSH));
 #endif
                                 if (Z_STREAM_ERROR == nRetval)
                                 {
@@ -250,9 +250,9 @@ namespace
                                 zstream->avail_out = BACKUP_FILE_HELPER_BLOCK_SIZE;
                                 zstream->next_out = reinterpret_cast<unsigned char*>(aBuffer);
 #if !defined Z_PREFIX
-                                const sal_uInt64 nRetval(inflate(zstream.get(), Z_NO_FLUSH));
+                                const sal_Int64 nRetval(inflate(zstream.get(), Z_NO_FLUSH));
 #else
-                                const sal_uInt64 nRetval(z_inflate(zstream.get(), Z_NO_FLUSH));
+                                const sal_Int64 nRetval(z_inflate(zstream.get(), Z_NO_FLUSH));
 #endif
                                 if (Z_STREAM_ERROR == nRetval)
                                 {


More information about the Libreoffice-commits mailing list