summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
Diffstat (limited to 'idl')
-rw-r--r--idl/source/objects/basobj.cxx14
-rw-r--r--idl/source/objects/bastype.cxx8
-rw-r--r--idl/source/objects/module.cxx4
-rw-r--r--idl/source/objects/object.cxx4
-rw-r--r--idl/source/objects/slot.cxx6
-rw-r--r--idl/source/objects/types.cxx12
-rw-r--r--idl/source/prj/database.cxx8
7 files changed, 28 insertions, 28 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 8ca2ca85501e..08b812970535 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -64,7 +64,7 @@ sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegP
while( bOnlySpace && rOutStm.Tell() < nPos )
{
char c;
- rOutStm >> c;
+ rOutStm.ReadChar( c );
if( !isspace( c ) )
bOnlySpace = sal_False;
}
@@ -82,12 +82,12 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
sal_uLong nPos = rOutStm.Tell();
rOutStm.SeekRel( -1 );
char c = 0;
- rOutStm >> c;
+ rOutStm.ReadChar( c );
while( isspace( c ) && rOutStm.Tell() != 1 )
{
rOutStm.SeekRel( -2 );
- rOutStm >> c;
+ rOutStm.ReadChar( c );
}
if( c == ';' || c == ',' )
@@ -119,7 +119,7 @@ void SvMetaName::Load( SvPersistStream & rStm )
{
SvMetaObject::Load( rStm );
sal_uInt8 nMask;
- rStm >> nMask;
+ rStm.ReadUChar( nMask );
if( nMask >= 0x20 )
{
@@ -347,7 +347,7 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
while( bOnlySpace && rOutStm.Tell() < nPos )
{
char c;
- rOutStm >> c;
+ rOutStm.ReadChar( c );
if( !isspace( c ) )
bOnlySpace = sal_False;
}
@@ -402,7 +402,7 @@ void SvMetaReference::Load( SvPersistStream & rStm )
SvMetaName::Load( rStm );
sal_uInt8 nMask;
- rStm >> nMask;
+ rStm.ReadUChar( nMask );
if( nMask >= 0x2 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
@@ -445,7 +445,7 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
SvMetaReference::Load( rStm );
sal_uInt8 nMask;
- rStm >> nMask;
+ rStm.ReadUChar( nMask );
if( nMask >= 0x20 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index b315190773d2..40ae0ddd68ce 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -77,7 +77,7 @@ SvStream& WriteSvBOOL(SvStream & rStm, const SvBOOL & rb )
SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
{
sal_uInt8 n;
- rStm >> n;
+ rStm.ReadUChar( n );
rb.nVal = (n & 0x01) ? sal_True : sal_False;
rb.bSet = (n & 0x02) ? sal_True : sal_False;
if( n & ~0x03 )
@@ -112,11 +112,11 @@ SvStream& WriteSvVersion(SvStream & rStm, const SvVersion & r )
SvStream& operator >> (SvStream & rStm, SvVersion & r )
{
sal_uInt8 n;
- rStm >> n;
+ rStm.ReadUChar( n );
if( n == 0 )
{ // not compressed
- rStm >> r.nMajorVersion;
- rStm >> r.nMinorVersion;
+ rStm.ReadUInt16( r.nMajorVersion );
+ rStm.ReadUInt16( r.nMinorVersion );
}
else
{ // compressed
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 72985e968cfd..170053a857ed 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -49,7 +49,7 @@ void SvMetaModule::Load( SvPersistStream & rStm )
sal_uInt16 nVer;
- rStm >> nVer; // version
+ rStm.ReadUInt16( nVer ); // version
DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" );
rStm >> aClassList;
@@ -63,7 +63,7 @@ void SvMetaModule::Load( SvPersistStream & rStm )
// read compiler data
sal_uInt16 nCmpLen;
- rStm >> nCmpLen;
+ rStm.ReadUInt16( nCmpLen );
DBG_ASSERT( (nVer & IDL_WRITE_MASK) == IDL_WRITE_COMPILER,
"no idl compiler format" );
rStm >> aBeginName;
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 74977a1e75c5..55592dc6ee54 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -36,7 +36,7 @@ SvClassElement::SvClassElement()
void SvClassElement::Load( SvPersistStream & rStm )
{
sal_uInt8 nMask;
- rStm >> nMask;
+ rStm.ReadUChar( nMask );
if( nMask >= 0x08 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
@@ -79,7 +79,7 @@ void SvMetaClass::Load( SvPersistStream & rStm )
SvMetaType::Load( rStm );
sal_uInt8 nMask;
- rStm >> nMask;
+ rStm.ReadUChar( nMask );
if( nMask >= 0x20 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 612bd60a116c..563511e11b49 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -64,7 +64,7 @@ void SvMetaSlot::Load( SvPersistStream & rStm )
SvMetaAttribute::Load( rStm );
sal_uInt16 nMask;
- rStm >> nMask;
+ rStm.ReadUInt16( nMask );
TEST_READ
if( nMask & 0x0001 )
@@ -106,7 +106,7 @@ void SvMetaSlot::Load( SvPersistStream & rStm )
if( nMask & 0x8000 ) rStm >> aAsynchron;
nMask = 0;
- rStm >> nMask;
+ rStm.ReadUInt16( nMask );
TEST_READ
if( nMask & 0x0001 ) rStm >> aRecordPerItem;
@@ -149,7 +149,7 @@ void SvMetaSlot::Load( SvPersistStream & rStm )
if( nMask & 0x8000 ) rStm >> aImageRotation;
nMask = 0;
- rStm >> nMask;
+ rStm.ReadUInt16( nMask );
TEST_READ
if( nMask & 0x0001 ) rStm >> aUnoName;
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index b9f54cc535cd..b964f0f7ad54 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -54,7 +54,7 @@ void SvMetaAttribute::Load( SvPersistStream & rStm )
SvMetaReference::Load( rStm );
sal_uInt8 nMask;
- rStm >> nMask;
+ rStm.ReadUChar( nMask );
if( nMask & 0x01 )
{
SvMetaType * pType;
@@ -789,7 +789,7 @@ void SvMetaType::Load( SvPersistStream & rStm )
SvMetaExtern::Load( rStm );
sal_uInt16 nMask;
- rStm >> nMask;
+ rStm.ReadUInt16( nMask );
if( nMask & 0x0001 ) rStm >> aIn;
if( nMask & 0x0002 ) rStm >> aOut;
if( nMask & 0x0004 ) rStm >> aCall0;
@@ -804,10 +804,10 @@ void SvMetaType::Load( SvPersistStream & rStm )
if( nMask & 0x0800 )
{
sal_uInt16 nT;
- rStm >> nT;
+ rStm.ReadUInt16( nT );
nType = nT;
}
- if( nMask & 0x1000 ) rStm >> cParserChar;
+ if( nMask & 0x1000 ) rStm.ReadChar( cParserChar );
if( nMask & 0x2000 ) rStm >> aCName;
if( nMask & 0x4000 ) rStm >> aBasicName;
if( nMask & 0x8000 ) rStm >> aBasicPostfix;
@@ -1765,7 +1765,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm )
SvMetaName::Load( rStm );
sal_uInt8 nMask;
- rStm >> nMask;
+ rStm.ReadUChar( nMask );
if( nMask >= 0x02 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
@@ -1821,7 +1821,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm )
SvMetaType::Load( rStm );
sal_uInt8 nMask;
- rStm >> nMask;
+ rStm.ReadUChar( nMask );
if( nMask >= 0x04 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index c1152e6d94b7..a903329dcc3e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -87,7 +87,7 @@ sal_Bool SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
{
sal_uInt32 nSig = 0;
sal_uLong nPos = rStm.Tell();
- rStm >> nSig;
+ rStm.ReadUInt32( nSig );
rStm.Seek( nPos );
return nSig == DATABASE_SIGNATURE;
@@ -101,8 +101,8 @@ void SvIdlDataBase::Load( SvStream & rStm )
sal_uInt16 nVersion = 0;
sal_uInt32 nSig = 0;
- aPStm >> nSig;
- aPStm >> nVersion;
+ aPStm.ReadUInt32( nSig );
+ aPStm.ReadUInt16( nVersion );
if( nSig != DATABASE_SIGNATURE )
{
aPStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
@@ -117,7 +117,7 @@ void SvIdlDataBase::Load( SvStream & rStm )
aPStm >> aTypeList;
aPStm >> aAttrList;
aPStm >> aModuleList;
- aPStm >> nUniqueId;
+ aPStm.ReadUInt32( nUniqueId );
if( aPStm.IsEof() )
aPStm.SetError( SVSTREAM_GENERALERROR );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 10:22:52 +0000