4 files changed, 12 insertions, 11 deletions
diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index b06910786669..62835ee713a3 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -129,7 +129,8 @@ AxBinaryPropertyReader::ComplexProperty::~ComplexProperty()
 
 bool AxBinaryPropertyReader::PairProperty::readProperty( AxAlignedInputStream& rInStrm )
 {
-    rInStrm >> mrPairData.first >> mrPairData.second;
+    mrPairData.first = rInStrm.readInt32();
+    mrPairData.second = rInStrm.readInt32();
     return true;
 }
 
diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx
index 73461955168a..71c01d6dcc8b 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -100,7 +100,7 @@ AxBinaryPropertyWriter::ComplexProperty::~ComplexProperty()
 
 bool AxBinaryPropertyWriter::PairProperty::writeProperty( AxAlignedOutputStream& rOutStrm )
 {
-    rOutStrm << mrPairData.first << mrPairData.second;
+    rOutStrm.WriteInt32(mrPairData.first).WriteInt32(mrPairData.second);
     return true;
 }
 
@@ -117,16 +117,16 @@ AxBinaryPropertyWriter::AxBinaryPropertyWriter( BinaryOutputStream& rOutStrm, bo
     mb64BitPropFlags( b64BitPropFlags )
 {
     sal_uInt16 nId( 0x0200 );
-    maOutStrm << nId;
+    maOutStrm.WriteUInt16(nId);
     mnBlockSize = 0; // will be filled in the finalize method
 
-    maOutStrm << nId;
+    maOutStrm.WriteUInt16(nId);
     mnPropFlagsStart = maOutStrm.tell();
 
     if( mb64BitPropFlags )
-        maOutStrm << mnPropFlags;
+        maOutStrm.WriteInt64( mnPropFlags );
     else
-        maOutStrm << sal_uInt32( mnPropFlags );
+        maOutStrm.WriteUInt32( mnPropFlags );
     mnNextProp = 1;
 }
 
@@ -177,12 +177,12 @@ bool AxBinaryPropertyWriter::finalizeExport()
     sal_Int64 nPos = maOutStrm.tell();
     maOutStrm.seek( mnPropFlagsStart - sizeof( mnBlockSize ) );
 
-    maOutStrm << mnBlockSize;
+    maOutStrm.WriteInt16( mnBlockSize );
 
     if( mb64BitPropFlags )
-        maOutStrm << mnPropFlags;
+        maOutStrm.WriteInt64( mnPropFlags );
     else
-        maOutStrm << sal_uInt32( mnPropFlags );
+        maOutStrm.WriteUInt32( mnPropFlags );
 
     maOutStrm.seek( nPos );
     return true;
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 4c0bf9bd2b08..15291b80055e 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -91,7 +91,7 @@ void VbaModule::importDirRecords( BinaryInputStream& rDirStrm )
             break;
             case VBA_ID_MODULEOFFSET:
                 OOX_ENSURE_RECORDSIZE( nRecSize == 4 );
-                aRecStrm >> mnOffset;
+                mnOffset = aRecStrm.readuInt32();
             break;
             case VBA_ID_MODULEHELPCONTEXT:
                 OOX_ENSURE_RECORDSIZE( nRecSize == 4 );
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 24d474d43501..cb737d7f52ea 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -315,7 +315,7 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
             case VBA_ID_PROJECTMODULES:
                 OOX_ENSURE_RECORDSIZE( nRecSize == 2 );
                 OSL_ENSURE( maModules.empty(), "VbaProject::importVba - unexpected PROJECTMODULES record" );
-                aRecStrm >> nModuleCount;
+                nModuleCount = aRecStrm.readuInt16();
             break;
             case VBA_ID_MODULENAME:
             {