summaryrefslogtreecommitdiff
path: root/writerperfect
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-03-01 16:09:18 +0000
committerKurt Zenker <kz@openoffice.org>2005-03-01 16:09:18 +0000
commitaa1bb5818c69e39880c9dc30aaf4198ccb58719a (patch)
tree19f9e98f0ede8204b0af306be2cc5f983b7272e1 /writerperfect
parent8c1c07163467af10265d51044ebbe9776e10e8a8 (diff)
INTEGRATION: CWS libwpdupgrade (1.3.2); FILE MERGED
2005/02/08 15:27:59 rene 1.3.2.2: fix OLE docs (thanks mmeeks@) 2005/02/02 20:44:46 rene 1.3.2.1: upgrade writerperfect to new libwpd API and implement --with-system-libwpd. Remove old libwpd/ stuff, tarball will come when the actual release happened :-)
Diffstat (limited to 'writerperfect')
-rw-r--r--writerperfect/source/stream/WPXSvStream.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/writerperfect/source/stream/WPXSvStream.cxx b/writerperfect/source/stream/WPXSvStream.cxx
index ff589cdc3a59..2ce67a489189 100644
--- a/writerperfect/source/stream/WPXSvStream.cxx
+++ b/writerperfect/source/stream/WPXSvStream.cxx
@@ -29,10 +29,12 @@ WPXSvInputStream::~WPXSvInputStream()
{
}
-const uint8_t * WPXSvInputStream::read(size_t numBytes)
+const uint8_t * WPXSvInputStream::read(size_t numBytes, size_t &numBytesRead)
{
// FIXME: assume no short reads (?)
+ sal_Int64 oldMnOffset = mnOffset;
mnOffset += mxStream->readBytes (maData, numBytes);
+ numBytesRead = mnOffset - oldMnOffset;
return (const uint8_t *)maData.getConstArray();
}
@@ -92,7 +94,7 @@ WPXInputStream * WPXSvInputStream::getDocumentOLEStream()
rtl::OUString::createFromAscii( "PerfectOffice_MAIN" ),
STREAM_STD_READ );
- Reference < XInputStream > xContents = new utl::OInputStreamWrapper( mxChildStream );
+ Reference < XInputStream > xContents = new utl::OSeekableInputStreamWrapper( mxChildStream );
if (xContents.is())
return new WPXSvInputStream( xContents );
else