1 files changed, 36 insertions, 15 deletions

diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx
index e56e8b5fbc89..7e2c88dc480f 100644
--- a/oox/source/ole/vbainputstream.cxx
+++ b/oox/source/ole/vbainputstream.cxx
@@ -47,17 +47,38 @@ const sal_uInt16 VBACHUNK_LENMASK           = 0x0FFF;
 // ============================================================================
 
 VbaInputStream::VbaInputStream( BinaryInputStream& rInStrm ) :
-    mrInStrm( rInStrm ),
+    BinaryStreamBase( false ),
+    mpInStrm( &rInStrm ),
     mnChunkPos( 0 )
 {
     maChunk.reserve( 4096 );
 
-    sal_uInt8 nSig = mrInStrm.readuInt8();
+    sal_uInt8 nSig = rInStrm.readuInt8();
     OSL_ENSURE( nSig == VBASTREAM_SIGNATURE, "VbaInputStream::VbaInputStream - wrong signature" );
-    mbEof = nSig != VBASTREAM_SIGNATURE;
+    mbEof = mbEof || rInStrm.isEof() || (nSig != VBASTREAM_SIGNATURE);
 }
 
-sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes )
+sal_Int64 VbaInputStream::size() const
+{
+    return -1;
+}
+
+sal_Int64 VbaInputStream::tell() const
+{
+    return -1;
+}
+
+void VbaInputStream::seek( sal_Int64 )
+{
+}
+
+void VbaInputStream::close()
+{
+    mpInStrm = 0;
+    mbEof = true;
+}
+
+sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize )
 {
     sal_Int32 nRet = 0;
     if( !mbEof )
@@ -65,7 +86,7 @@ sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes
         orData.realloc( ::std::max< sal_Int32 >( nBytes, 0 ) );
         if( nBytes > 0 )
         {
-            nRet = readMemory( orData.getArray(), nBytes );
+            nRet = readMemory( orData.getArray(), nBytes, nAtomSize );
             if( nRet < nBytes )
                 orData.realloc( nRet );
         }
@@ -73,7 +94,7 @@ sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes
     return nRet;
 }
 
-sal_Int32 VbaInputStream::readMemory( void* opMem, sal_Int32 nBytes )
+sal_Int32 VbaInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     sal_Int32 nRet = 0;
     sal_uInt8* opnMem = reinterpret_cast< sal_uInt8* >( opMem );
@@ -90,7 +111,7 @@ sal_Int32 VbaInputStream::readMemory( void* opMem, sal_Int32 nBytes )
     return nRet;
 }
 
-void VbaInputStream::skip( sal_Int32 nBytes )
+void VbaInputStream::skip( sal_Int32 nBytes, size_t /*nAtomSize*/ )
 {
     while( (nBytes > 0) && updateChunk() )
     {
@@ -108,8 +129,8 @@ bool VbaInputStream::updateChunk()
     if( mbEof || (mnChunkPos < maChunk.size()) ) return !mbEof;
 
     // try to read next chunk header, this may trigger EOF
-    sal_uInt16 nHeader = mrInStrm.readuInt16();
-    mbEof = mrInStrm.isEof();
+    sal_uInt16 nHeader = mpInStrm->readuInt16();
+    mbEof = mpInStrm->isEof();
     if( mbEof ) return false;
 
     // check header signature
@@ -126,15 +147,15 @@ bool VbaInputStream::updateChunk()
         maChunk.clear();
         sal_uInt8 nBitCount = 4;
         sal_uInt16 nChunkPos = 0;
-        while( !mbEof && !mrInStrm.isEof() && (nChunkPos < nChunkLen) )
+        while( !mbEof && !mpInStrm->isEof() && (nChunkPos < nChunkLen) )
         {
-            sal_uInt8 nTokenFlags = mrInStrm.readuInt8();
+            sal_uInt8 nTokenFlags = mpInStrm->readuInt8();
             ++nChunkPos;
-            for( int nBit = 0; !mbEof && !mrInStrm.isEof() && (nBit < 8) && (nChunkPos < nChunkLen); ++nBit, nTokenFlags >>= 1 )
+            for( int nBit = 0; !mbEof && !mpInStrm->isEof() && (nBit < 8) && (nChunkPos < nChunkLen); ++nBit, nTokenFlags >>= 1 )
             {
                 if( nTokenFlags & 1 )
                 {
-                    sal_uInt16 nCopyToken = mrInStrm.readuInt16();
+                    sal_uInt16 nCopyToken = mpInStrm->readuInt16();
                     nChunkPos = nChunkPos + 2;
                     // update bit count used for offset/length in the token
                     while( static_cast< size_t >( 1 << nBitCount ) < maChunk.size() ) ++nBitCount;
@@ -164,7 +185,7 @@ bool VbaInputStream::updateChunk()
                 else
                 {
                     maChunk.resize( maChunk.size() + 1 );
-                    mrInStrm >> maChunk.back();
+                    *mpInStrm >> maChunk.back();
                     ++nChunkPos;
                 }
             }
@@ -173,7 +194,7 @@ bool VbaInputStream::updateChunk()
     else
     {
         maChunk.resize( nChunkLen );
-        mrInStrm.readMemory( &maChunk.front(), nChunkLen );
+        mpInStrm->readMemory( &maChunk.front(), nChunkLen );
     }
 
     mnChunkPos = 0;