summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--idl/inc/lex.hxx4
-rw-r--r--idl/source/objects/basobj.cxx12
-rw-r--r--idl/source/objects/bastype.cxx18
-rw-r--r--idl/source/objects/module.cxx4
-rw-r--r--idl/source/objects/object.cxx2
-rw-r--r--idl/source/objects/slot.cxx2
-rw-r--r--idl/source/objects/types.cxx4
7 files changed, 23 insertions, 23 deletions
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index bc0feea2c302..a9869de4c2ed 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -186,7 +186,7 @@ public:
SvToken& GetToken() const { return *(*pCurToken).get(); }
- bool Read( char cChar )
+ bool ReadIf( char cChar )
{
if( (*pCurToken)->IsChar()
&& cChar == (*pCurToken)->GetChar() )
@@ -198,7 +198,7 @@ public:
return false;
}
- void ReadDelimiter()
+ void ReadIfDelimiter()
{
if( (*pCurToken)->IsChar()
&& (';' == (*pCurToken)->GetChar()
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 62632a7e528a..835ae2dc2523 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -100,7 +100,7 @@ void SvMetaObject::DoReadContextSvIdl( SvIdlDataBase & rBase,
{
nBeginPos = rInStm.Tell();
ReadContextSvIdl( rBase, rInStm );
- rInStm.ReadDelimiter();
+ rInStm.ReadIfDelimiter();
}
}
@@ -117,24 +117,24 @@ bool SvMetaObject::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
bool bOk = true;
- if( rInStm.Read( '[' ) )
+ if( rInStm.ReadIf( '[' ) )
{
sal_uInt32 nBeginPos = 0; // can not happen with Tell
while( nBeginPos != rInStm.Tell() )
{
nBeginPos = rInStm.Tell();
ReadAttributesSvIdl( rBase, rInStm );
- rInStm.ReadDelimiter();
+ rInStm.ReadIfDelimiter();
}
- bOk = rInStm.Read( ']' );
+ bOk = rInStm.ReadIf( ']' );
}
if( bOk )
{
- if( rInStm.Read( '{' ) )
+ if( rInStm.ReadIf( '{' ) )
{
DoReadContextSvIdl( rBase, rInStm );
- bOk = rInStm.Read( '}' );
+ bOk = rInStm.ReadIf( '}' );
}
}
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index d200f682939d..08c59f9a808c 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -36,8 +36,8 @@ bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
if( rTok.Is( pName ) )
{
bool bOk = true;
- bool bBracket = rInStm.Read( '(' );
- if( bBracket || rInStm.Read( '=' ) )
+ bool bBracket = rInStm.ReadIf( '(' );
+ if( bBracket || rInStm.ReadIf( '=' ) )
{
rTok = rInStm.GetToken();
if( rTok.IsBool() )
@@ -47,7 +47,7 @@ bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
rInStm.GetToken_Next();
}
if( bOk && bBracket )
- bOk = rInStm.Read( ')' );
+ bOk = rInStm.ReadIf( ')' );
}
else
*this = true; //default action set to TRUE
@@ -66,8 +66,8 @@ bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
if( rTok.Is( pName ) )
{
bool bOk = true;
- bool bBracket = rInStm.Read( '(' );
- if( bBracket || rInStm.Read( '=' ) )
+ bool bBracket = rInStm.ReadIf( '(' );
+ if( bBracket || rInStm.ReadIf( '=' ) )
{
rTok = rInStm.GetToken();
if( rTok.IsIdentifier() )
@@ -76,7 +76,7 @@ bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
rInStm.GetToken_Next();
}
if( bOk && bBracket )
- bOk = rInStm.Read( ')' );
+ bOk = rInStm.ReadIf( ')' );
}
if( bOk )
return true;
@@ -111,8 +111,8 @@ bool ReadStringSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, OString
if( rTok.Is( pName ) )
{
bool bOk = true;
- bool bBracket = rInStm.Read( '(' );
- if( bBracket || rInStm.Read( '=' ) )
+ bool bBracket = rInStm.ReadIf( '(' );
+ if( bBracket || rInStm.ReadIf( '=' ) )
{
rTok = rInStm.GetToken();
if( rTok.IsString() )
@@ -121,7 +121,7 @@ bool ReadStringSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, OString
rInStm.GetToken_Next();
}
if( bOk && bBracket )
- bOk = rInStm.Read( ')' );
+ bOk = rInStm.ReadIf( ')' );
}
if( bOk )
return true;
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 2062f05f633e..06614ed5efc5 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -119,7 +119,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
{
nBeginPos = aTokStm.Tell();
ReadContextSvIdl( rBase, aTokStm );
- aTokStm.ReadDelimiter();
+ aTokStm.ReadIfDelimiter();
}
bOk = aTokStm.GetToken().IsEof();
if( !bOk )
@@ -154,7 +154,7 @@ bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
sal_uInt32 nTokPos = rInStm.Tell();
SvToken& rTok = rInStm.GetToken_Next();
bool bOk = rTok.Is( SvHash_module() );
- rInStm.ReadDelimiter();
+ rInStm.ReadIfDelimiter();
if( bOk )
{
rBase.Push( this ); // onto the context stack
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 396eedaaebfe..c5c3589acdea 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -106,7 +106,7 @@ bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
(GetMetaTypeType() == MetaTypeType::Interface || GetMetaTypeType() == MetaTypeType::Shell) )
{
bool bOk = true;
- if( rInStm.Read( ':' ) )
+ if( rInStm.ReadIf( ':' ) )
{
aSuperClass = rBase.ReadKnownClass( rInStm );
bOk = aSuperClass.Is();
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 60960d2e5c74..894d316e9b45 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -283,7 +283,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvToken& rTok = rInStm.GetToken_Next();
if( rTok.Is( SvHash_SlotType() ) )
{
- if( rInStm.Read( '=' ) )
+ if( rInStm.ReadIf( '=' ) )
{
aSlotType = rBase.ReadKnownType( rInStm );
if( !aSlotType.Is() )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index eb48cf694cc6..d63e8c7801d2 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -322,10 +322,10 @@ bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
- if( rInStm.Read( '(' ) )
+ if( rInStm.ReadIf( '(' ) )
{
DoReadContextSvIdl( rBase, rInStm );
- if( rInStm.Read( ')' ) )
+ if( rInStm.ReadIf( ')' ) )
{
SetType( MetaTypeType::Method );
return true;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 21:21:44 +0000