[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - shell/inc shell/source

[Fridrich Å trba]

 shell/inc/internal/stream_helper.hxx                      |    4 ++--
 shell/inc/internal/types.hxx                              |    2 +-
 shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b614a97dce3ad86ee50494f24b1578d29f6deb20
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Jul 16 17:13:14 2013 +0200

    bnc#829017 fix issue with negative seeks in win32 shell extension
    
    Change-Id: Ia8072f78ad43281e406377922f50f8de53194f1b
    (cherry picked from commit 2a4c55f6d46aec5164ec2ec189ee39cf71c9308c)
    Reviewed-on: https://gerrit.libreoffice.org/4941
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>
    (cherry picked from commit 57cc8bcb701de4291be5ed4c4b2de57eef049730)
    Reviewed-on: https://gerrit.libreoffice.org/4945
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx
index 77af988..a7a48ab 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -31,7 +31,7 @@ public:
     ~BufferStream();
     unsigned long sread (unsigned char *vuf, unsigned long size);
     long stell ();
-    long sseek (unsigned long offset, int origin);
+    long sseek (long offset, int origin);
 private:
     IStream *stream;
 };
@@ -43,7 +43,7 @@ public:
     ~FileStream();
     unsigned long sread (unsigned char *buf, unsigned long size);
     long stell ();
-    long sseek (unsigned long offset, int origin);
+    long sseek (long offset, int origin);
 private:
     FILE *file;
 };
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 15a03ca..8fc66d9 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -78,7 +78,7 @@ public:
     virtual ~StreamInterface() {}
     virtual unsigned long sread (unsigned char* vuf, unsigned long size) = 0;
     virtual long stell () = 0;
-    virtual long sseek (unsigned long offset, int origin) = 0;
+    virtual long sseek (long offset, int origin) = 0;
 };
 
 #endif
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 4f78900..3b77d28 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -74,7 +74,7 @@ long BufferStream::stell ()
         return -1;
 }
 
-long BufferStream::sseek (unsigned long offset, int origin)
+long BufferStream::sseek (long offset, int origin)
 {
     HRESULT hr;
     LARGE_INTEGER Move;
@@ -129,7 +129,7 @@ long FileStream::stell ()
     return -1L;
 }
 
-long FileStream::sseek (unsigned long offset, int origin)
+long FileStream::sseek (long offset, int origin)
 {
     if (file)
         return fseek(file, offset, origin);