diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-16 17:13:14 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-07-16 15:47:04 +0000 |
| commit | f7ff371fdc4c44820a1cfae90c2f1af704f276a2 (patch) | |
| tree | 22029b17e890300d56865a7d9ac6348da4537c74 | |
| parent | 6877ddc50d601f57d4cf77379ae613a33df19711 (diff) | |
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/4942
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
| -rw-r--r-- | shell/inc/internal/stream_helper.hxx | 4 | ||||
| -rw-r--r-- | shell/inc/internal/types.hxx | 2 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx index 77af98846630..a7a48ab37982 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 15a03ca2f9e7..8fc66d9e5d20 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 4f78900d9dac..3b77d285d34e 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); |