summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-08 11:42:16 +0200
committerNoel Grandin <noel@peralex.com>2014-05-08 11:44:54 +0200
commitf0268c9c1be546aa0b5fc9c359f514e5d8af5bbb (patch)
tree57ca82b332aa5c9ec13909ea2439c280dc9fe379 /idl
parent9c117de4c1d291823d1588a99011ababab2112c8 (diff)
idl: sal_Bool->bool
Change-Id: I8b15c97b1fcc6acaf567e8b1d2d37cbc99687a9d
Diffstat (limited to 'idl')
-rw-r--r--idl/inc/basobj.hxx18
-rw-r--r--idl/inc/bastype.hxx70
-rw-r--r--idl/inc/command.hxx2
-rw-r--r--idl/inc/database.hxx28
-rw-r--r--idl/inc/hash.hxx28
-rw-r--r--idl/inc/lex.hxx59
-rw-r--r--idl/inc/module.hxx14
-rw-r--r--idl/inc/object.hxx12
-rw-r--r--idl/inc/slot.hxx114
-rw-r--r--idl/inc/types.hxx82
-rw-r--r--idl/source/cmptools/hash.cxx24
-rw-r--r--idl/source/cmptools/lex.cxx18
-rw-r--r--idl/source/objects/basobj.cxx46
-rw-r--r--idl/source/objects/bastype.cxx96
-rw-r--r--idl/source/objects/module.cxx30
-rw-r--r--idl/source/objects/object.cxx20
-rw-r--r--idl/source/objects/slot.cxx136
-rw-r--r--idl/source/objects/types.cxx160
-rw-r--r--idl/source/prj/command.cxx18
-rw-r--r--idl/source/prj/database.cxx124
-rw-r--r--idl/source/prj/svidl.cxx8
21 files changed, 554 insertions, 553 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index a3fce244a4c6..34d0b100e069 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -62,11 +62,11 @@ public:
SvMetaObject();
static void WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
- static sal_Bool TestAndSeekSpaceOnly( SvStream &, sal_uLong nBegPos );
+ static bool TestAndSeekSpaceOnly( SvStream &, sal_uLong nBegPos );
static void Back2Delemitter( SvStream & );
static void WriteStars( SvStream & );
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
@@ -107,7 +107,7 @@ class SvMetaName : public SvMetaObject
SvString aDescription;
protected:
- virtual sal_Bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
char c = '\0' );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -125,7 +125,7 @@ public:
SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
SvMetaName();
- virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL );
+ virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL );
void SetDescription( const OString& rText )
{ aDescription.setString(rText); }
const SvHelpContext& GetHelpContext() const { return aHelpContext; }
@@ -134,8 +134,8 @@ public:
virtual const SvString & GetConfigName() const{ return aConfigName; }
virtual const SvString& GetDescription() const{ return aDescription; }
- virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0) SAL_OVERRIDE;
@@ -201,8 +201,8 @@ class SvMetaExtern : public SvMetaReference
SvUUId aUUId;
SvVersion aVersion;
- sal_Bool bReadUUId;
- sal_Bool bReadVersion;
+ bool bReadUUId;
+ bool bReadVersion;
public:
SV_DECL_META_FACTORY1( SvMetaExtern, SvMetaName, 16 )
SvMetaExtern();
@@ -212,7 +212,7 @@ public:
const SvGlobalName &GetUUId() const;
const SvVersion & GetVersion() const { return aVersion; }
void SetModule( SvIdlDataBase & rBase );
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 0bd86515aac8..588f091ef532 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -52,45 +52,45 @@ public:
class Svint
{
int nVal;
- sal_Bool bSet;
+ bool bSet;
public:
- Svint() { nVal = bSet = 0; }
- Svint( int n ) : nVal( n ), bSet( sal_True ) {}
- Svint( int n, sal_Bool bSetP ) : nVal( n ), bSet( bSetP ) {}
- Svint & operator = ( int n ) { nVal = n; bSet = sal_True; return *this; }
+ Svint() { nVal = 0; bSet = false; }
+ Svint( int n ) : nVal( n ), bSet( true ) {}
+ Svint( int n, bool bSetP ) : nVal( n ), bSet( bSetP ) {}
+ Svint & operator = ( int n ) { nVal = n; bSet = true; return *this; }
operator int ()const { return nVal; }
- sal_Bool IsSet() const { return bSet; }
+ bool IsSet() const { return bSet; }
friend SvStream& WriteSvint(SvStream & rStm, const Svint & r )
{ SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm.WriteUInt8( r.bSet ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, Svint & r )
- { r.nVal = (int)SvUINT32::Read( rStm ); rStm.ReadUChar( r.bSet ); return rStm; }
+ { r.nVal = (int)SvUINT32::Read( rStm ); rStm.ReadCharAsBool( r.bSet ); return rStm; }
};
class SvBOOL
{
- sal_Bool nVal:1,
+ bool nVal:1,
bSet:1;
public:
- SvBOOL() { bSet = nVal = sal_False; }
- SvBOOL( sal_Bool n ) : nVal( n ), bSet( sal_True ) {}
- SvBOOL( sal_Bool n, sal_Bool bSetP ) : nVal( n ), bSet( bSetP ) {}
- SvBOOL & operator = ( sal_Bool n ) { nVal = n; bSet = sal_True; return *this; }
+ SvBOOL() { bSet = nVal = false; }
+ SvBOOL( bool n ) : nVal( n ), bSet( true ) {}
+ SvBOOL( bool n, bool bSetP ) : nVal( n ), bSet( bSetP ) {}
+ SvBOOL & operator = ( bool n ) { nVal = n; bSet = true; return *this; }
- operator sal_Bool() const { return nVal; }
+ operator bool() const { return nVal; }
#ifdef STC
operator int() const { return nVal; }
#endif
- sal_Bool Is() const { return nVal; }
- sal_Bool IsSet() const { return bSet; }
+ bool Is() const { return nVal; }
+ bool IsSet() const { return bSet; }
friend SvStream& WriteSvBOOL(SvStream &, const SvBOOL &);
friend SvStream& operator >> (SvStream &, SvBOOL &);
- sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
+ bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
OString GetSvIdlString( SvStringHashEntry * pName );
};
@@ -114,12 +114,12 @@ public:
friend SvStream& WriteSvIdentifier(SvStream &, const SvIdentifier &);
friend SvStream& operator >> (SvStream &, SvIdentifier &);
- sal_Bool IsSet() const
+ bool IsSet() const
{
return !m_aStr.isEmpty();
}
- sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+ bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
sal_uInt16 nTab );
};
@@ -128,10 +128,10 @@ class SvNumberIdentifier : public SvIdentifier
{
sal_uInt32 nValue;
// must not be used
- sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
public:
SvNumberIdentifier() : nValue( 0 ) {};
- sal_Bool IsSet() const
+ bool IsSet() const
{
return SvIdentifier::IsSet() || nValue != 0;
}
@@ -140,8 +140,8 @@ public:
friend SvStream& WriteSvNumberIdentifier(SvStream &, const SvNumberIdentifier &);
friend SvStream& operator >> (SvStream &, SvNumberIdentifier &);
- sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- sal_Bool ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
+ bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ bool ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
SvTokenStream & rInStm );
};
@@ -160,15 +160,15 @@ public:
{
return m_aStr;
}
- sal_Bool IsSet() const
+ bool IsSet() const
{
return !m_aStr.isEmpty();
}
friend SvStream& WriteSvString(SvStream &, const SvString &);
friend SvStream& operator >> (SvStream &, SvString &);
- sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+ bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
sal_uInt16 nTab );
};
@@ -177,8 +177,8 @@ class SvHelpText : public SvString
{
public:
SvHelpText() {}
- sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- sal_Bool WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
+ bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ bool WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab );
};
@@ -191,8 +191,8 @@ class SvUUId : public SvGlobalName
{
public:
SvUUId() {}
- sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- sal_Bool WriteSvIdl( SvStream & rOutStm );
+ bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ bool WriteSvIdl( SvStream & rOutStm );
};
@@ -202,12 +202,12 @@ class SvVersion
sal_uInt16 nMinorVersion;
public:
SvVersion() : nMajorVersion( 1 ), nMinorVersion( 0 ) {}
- sal_Bool operator == ( const SvVersion & r )
+ bool operator == ( const SvVersion & r )
{
return (r.nMajorVersion == nMajorVersion)
&& (r.nMinorVersion == nMinorVersion);
}
- sal_Bool operator != ( const SvVersion & r )
+ bool operator != ( const SvVersion & r )
{
return !(*this == r);
}
@@ -217,8 +217,8 @@ public:
friend SvStream& WriteSvVersion(SvStream &, const SvVersion &);
friend SvStream& operator >> (SvStream &, SvVersion &);
- sal_Bool ReadSvIdl( SvTokenStream & rInStm );
- sal_Bool WriteSvIdl( SvStream & rOutStm );
+ bool ReadSvIdl( SvTokenStream & rInStm );
+ bool WriteSvIdl( SvStream & rOutStm );
};
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index bbf730d8cef6..3f47ad87bcb7 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -50,7 +50,7 @@ public:
void Init();
class SvIdlWorkingBase;
-sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
+bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
void DeInit();
#endif // INCLUDED_IDL_INC_COMMAND_HXX
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 52fc9ef42205..805285d5aaf5 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -43,7 +43,7 @@ public:
const OString& GetText() const { return aText; }
void SetText( const OString& rT ) { aText = rT; }
- sal_Bool IsError() const { return nLine != 0; }
+ bool IsError() const { return nLine != 0; }
void Clear() { nLine = nColumn = 0; }
SvIdlError & operator = ( const SvIdlError & rRef )
{ aText = rRef.aText;
@@ -55,7 +55,7 @@ public:
class SvIdlDataBase
{
- sal_Bool bExport;
+ bool bExport;
OUString aExportFile;
sal_uInt32 nUniqueId;
sal_uInt32 nVerbosity;
@@ -85,7 +85,7 @@ public:
explicit SvIdlDataBase( const SvCommand& rCmd );
~SvIdlDataBase();
- static sal_Bool IsBinaryFormat( SvStream & rInStm );
+ static bool IsBinaryFormat( SvStream & rInStm );
void Load( SvStream & rInStm );
void Save( SvStream & rInStm, sal_uInt32 nContextFlags );
@@ -121,7 +121,7 @@ public:
void WriteError( SvTokenStream & rInStm );
void SetError( const OString& rError, SvToken * pTok );
void Push( SvMetaObject * pObj );
- sal_Bool Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
+ bool Pop( bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
{
GetStack().Pop();
if( bOk )
@@ -131,9 +131,9 @@ public:
return bOk;
}
sal_uInt32 GetUniqueId() { return ++nUniqueId; }
- sal_Bool FindId( const OString& rIdName, sal_uLong * pVal );
- sal_Bool InsertId( const OString& rIdName, sal_uLong nVal );
- sal_Bool ReadIdFile( const OUString & rFileName );
+ bool FindId( const OString& rIdName, sal_uLong * pVal );
+ bool InsertId( const OString& rIdName, sal_uLong nVal );
+ bool ReadIdFile( const OUString & rFileName );
SvMetaType * FindType( const OString& rName );
static SvMetaType * FindType( const SvMetaType *, SvMetaTypeMemberList & );
@@ -152,14 +152,14 @@ class SvIdlWorkingBase : public SvIdlDataBase
public:
explicit SvIdlWorkingBase( const SvCommand& rCmd );
- sal_Bool ReadSvIdl( SvTokenStream &, sal_Bool bImported, const OUString & rPath );
- sal_Bool WriteSvIdl( SvStream & );
+ bool ReadSvIdl( SvTokenStream &, bool bImported, const OUString & rPath );
+ bool WriteSvIdl( SvStream & );
- sal_Bool WriteSfx( SvStream & );
- sal_Bool WriteHelpIds( SvStream & );
- sal_Bool WriteSfxItem( SvStream & );
- sal_Bool WriteCSV( SvStream& );
- sal_Bool WriteDocumentation( SvStream& );
+ bool WriteSfx( SvStream & );
+ bool WriteHelpIds( SvStream & );
+ bool WriteSfxItem( SvStream & );
+ bool WriteCSV( SvStream& );
+ bool WriteDocumentation( SvStream& );
};
#endif // INCLUDED_IDL_INC_DATABASE_HXX
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 71e95609f76d..42cf191d7bbd 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -32,29 +32,29 @@ class SvHashTable
sal_uInt32 lAsk; // number of requests
sal_uInt32 lTry; // number of tries
protected:
- sal_Bool Test_Insert( const OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
+ bool Test_Insert( const OString&, bool bInsert, sal_uInt32 * pInsertPos );
// compare element with entry
- virtual bool equals( const OString& , sal_uInt32 ) const = 0;
+ virtual bool equals( const OString& , sal_uInt32 ) const = 0;
// get hash value from subclass
- virtual sal_uInt32 HashFunc( const OString& ) const = 0;
+ virtual sal_uInt32 HashFunc( const OString& ) const = 0;
public:
SvHashTable( sal_uInt32 nMaxEntries );
virtual ~SvHashTable();
- sal_uInt32 GetMax() const { return nMax; }
+ sal_uInt32 GetMax() const { return nMax; }
- virtual sal_Bool IsEntry( sal_uInt32 ) const = 0;
+ virtual bool IsEntry( sal_uInt32 ) const = 0;
};
class SvStringHashTable;
class SvStringHashEntry : public SvRefBase
{
friend class SvStringHashTable;
- OString aName;
+ OString aName;
sal_uInt32 nHashId;
sal_uLong nValue;
- sal_Bool bHasId;
+ bool bHasId;
public:
SvStringHashEntry()
: nHashId(0)
@@ -72,15 +72,15 @@ public:
virtual ~SvStringHashEntry();
const OString& GetName() const { return aName; }
- sal_Bool HasId() const { return bHasId; }
+ bool HasId() const { return bHasId; }
sal_uInt32 GetId() const { return nHashId; }
void SetValue( sal_uLong n ) { nValue = n; }
- sal_uLong GetValue() const { return nValue; }
+ sal_uLong GetValue() const { return nValue; }
- sal_Bool operator == ( const SvStringHashEntry & rRef )
+ bool operator == ( const SvStringHashEntry & rRef )
{ return nHashId == rRef.nHashId; }
- sal_Bool operator != ( const SvStringHashEntry & rRef )
+ bool operator != ( const SvStringHashEntry & rRef )
{ return ! operator == ( rRef ); }
SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
{ SvRefBase::operator=( rRef );
@@ -107,10 +107,10 @@ public:
virtual ~SvStringHashTable();
OString GetNearString( const OString& rName ) const;
- virtual sal_Bool IsEntry( sal_uInt32 nIndex ) const SAL_OVERRIDE;
+ virtual bool IsEntry( sal_uInt32 nIndex ) const SAL_OVERRIDE;
- sal_Bool Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string
- sal_Bool Test( const OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
+ bool Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string
+ bool Test( const OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
SvStringHashEntry & operator []( sal_uInt32 nPos ) const
{ return pEntries[ nPos ]; }
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 03900e14e314..a11bd6183ea9 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -41,7 +41,7 @@ friend class SvTokenStream;
union
{
sal_uLong nLong;
- sal_Bool bBool;
+ bool bBool;
char cChar;
SvStringHashEntry * pHash;
};
@@ -49,37 +49,37 @@ public:
SvToken();
SvToken( const SvToken & rObj );
SvToken( sal_uLong n );
- SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
+ SvToken( SVTOKEN_ENUM nTypeP, bool b );
SvToken( char c );
SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr );
SvToken( SVTOKEN_ENUM nTypeP );
SvToken & operator = ( const SvToken & rObj );
- OString GetTokenAsString() const;
+ OString GetTokenAsString() const;
SVTOKEN_ENUM GetType() const { return nType; }
void SetLine( sal_uLong nLineP ) { nLine = nLineP; }
- sal_uLong GetLine() const { return nLine; }
+ sal_uLong GetLine() const { return nLine; }
void SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP; }
- sal_uLong GetColumn() const { return nColumn; }
-
- sal_Bool IsEmpty() const { return nType == SVTOKEN_EMPTY; }
- sal_Bool IsComment() const { return nType == SVTOKEN_COMMENT; }
- sal_Bool IsInteger() const { return nType == SVTOKEN_INTEGER; }
- sal_Bool IsString() const { return nType == SVTOKEN_STRING; }
- sal_Bool IsBool() const { return nType == SVTOKEN_BOOL; }
- sal_Bool IsIdentifierHash() const
+ sal_uLong GetColumn() const { return nColumn; }
+
+ bool IsEmpty() const { return nType == SVTOKEN_EMPTY; }
+ bool IsComment() const { return nType == SVTOKEN_COMMENT; }
+ bool IsInteger() const { return nType == SVTOKEN_INTEGER; }
+ bool IsString() const { return nType == SVTOKEN_STRING; }
+ bool IsBool() const { return nType == SVTOKEN_BOOL; }
+ bool IsIdentifierHash() const
{ return nType == SVTOKEN_HASHID; }
- sal_Bool IsIdentifier() const
+ bool IsIdentifier() const
{
return nType == SVTOKEN_IDENTIFIER
|| nType == SVTOKEN_HASHID;
}
- sal_Bool IsChar() const { return nType == SVTOKEN_CHAR; }
- sal_Bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
- sal_Bool IsEof() const { return nType == SVTOKEN_EOF; }
+ bool IsChar() const { return nType == SVTOKEN_CHAR; }
+ bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
+ bool IsEof() const { return nType == SVTOKEN_EOF; }
const OString& GetString() const
{
@@ -87,16 +87,16 @@ public:
? pHash->GetName()
: aString;
}
- sal_uLong GetNumber() const { return nLong; }
- sal_Bool GetBool() const { return bBool; }
+ sal_uLong GetNumber() const { return nLong; }
+ bool GetBool() const { return bBool; }
char GetChar() const { return cChar; }
void SetHash( SvStringHashEntry * pHashP )
{ pHash = pHashP; nType = SVTOKEN_HASHID; }
- sal_Bool HasHash() const
+ bool HasHash() const
{ return nType == SVTOKEN_HASHID; }
SvStringHashEntry * GetHash() const { return pHash; }
- sal_Bool Is( SvStringHashEntry * pEntry ) const
+ bool Is( SvStringHashEntry * pEntry ) const
{ return IsIdentifierHash() && pHash == pEntry; }
};
@@ -110,7 +110,7 @@ inline SvToken::SvToken()
inline SvToken::SvToken( sal_uLong n )
: nType( SVTOKEN_INTEGER ), nLong( n ) {}
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, bool b )
: nType( nTypeP ), bBool( b ) {}
inline SvToken::SvToken( char c )
@@ -138,9 +138,10 @@ class SvTokenStream
boost::ptr_vector<SvToken> aTokList;
boost::ptr_vector<SvToken>::iterator pCurToken;
+ OString aBufStr;
+
void InitCtor();
- OString aBufStr;
int GetNextChar();
int GetFastNextChar()
{
@@ -150,9 +151,9 @@ class SvTokenStream
}
void FillTokenList();
- sal_uLong GetNumber();
- sal_Bool MakeToken( SvToken & );
- sal_Bool IsEof() const { return rInStream.IsEof(); }
+ sal_uLong GetNumber();
+ bool MakeToken( SvToken & );
+ bool IsEof() const { return rInStream.IsEof(); }
void SetMax()
{
sal_uLong n = Tell();
@@ -213,19 +214,19 @@ public:
SvToken* GetToken() const { return &(*pCurToken); }
- sal_Bool Read( char cChar )
+ bool Read( char cChar )
{
if( pCurToken->IsChar()
&& cChar == pCurToken->GetChar() )
{
GetToken_Next();
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
- void ReadDelemiter()
+ void ReadDelemiter()
{
if( pCurToken->IsChar()
&& (';' == pCurToken->GetChar()
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index ce3ab0288a6a..848fe590470c 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -44,7 +44,7 @@ class SvMetaModule : public SvMetaExtern
SvString aTypeLibFile;
SvString aModulePrefix;
- sal_Bool bImported : 1,
+ bool bImported : 1,
bIsModified : 1;
SvGlobalName aBeginName;
SvGlobalName aEndName;
@@ -61,7 +61,7 @@ public:
const OUString & GetIdlFileName() const { return aIdlFileName; }
const OString& GetModulePrefix() const { return aModulePrefix.getString(); }
- virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE;
+ virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE;
const OString& GetHelpFileName() const { return aHelpFileName.getString(); }
const OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
@@ -71,13 +71,13 @@ public:
const SvMetaClassMemberList & GetClassList() const { return aClassList; }
SvMetaModule( const OUString & rIdlFileName,
- sal_Bool bImported );
+ bool bImported );
- sal_Bool FillNextName( SvGlobalName * );
- sal_Bool IsImported() const { return bImported; }
- sal_Bool IsModified() const { return bIsModified; }
+ bool FillNextName( SvGlobalName * );
+ bool IsImported() const { return bImported; }
+ bool IsModified() const { return bIsModified; }
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void WriteAttributes( SvIdlDataBase & rBase,
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 01b51e204cdf..1e1037c29281 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -54,9 +54,9 @@ public:
const OString& GetPrefix() const
{ return aPrefix; }
- void SetAutomation( sal_Bool rAutomation )
+ void SetAutomation( bool rAutomation )
{ aAutomation = rAutomation; }
- sal_Bool GetAutomation() const
+ bool GetAutomation() const
{ return aAutomation; }
void SetClass( SvMetaClass * pClass )
@@ -79,7 +79,7 @@ class SvMetaClass : public SvMetaType
SvBOOL aAutomation;
SvMetaClassRef xAutomationInterface;
- sal_Bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+ bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const;
void WriteSlotStubs( const OString& rShellName,
SvSlotElementList & rSlotList,
@@ -107,14 +107,14 @@ protected:
virtual void WriteContextSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
void WriteOdlMembers( ByteStringList & rSuperList,
- sal_Bool bVariable, sal_Bool bWriteTab,
+ bool bVariable, bool bWriteTab,
SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab );
public:
SV_DECL_META_FACTORY1( SvMetaClass, SvMetaType, 6 )
SvMetaClass();
- sal_Bool GetAutomation() const
+ bool GetAutomation() const
{ return aAutomation; }
SvMetaClass * GetSuperClass() const
{ return aSuperClass; }
@@ -125,7 +125,7 @@ public:
GetClassList() const
{ return aClassList; }
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab,
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 787c4d30ea39..220c47866829 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -81,90 +81,90 @@ class SvMetaSlot : public SvMetaAttribute
void SetEnumValue(SvMetaEnumValue *p)
{ pEnumValue = p; }
protected:
- void SetCachable( sal_Bool bSet )
+ void SetCachable( bool bSet )
{
aCachable = bSet;
if( bSet )
- aVolatile = sal_False;
+ aVolatile = false;
}
- void SetVolatile( sal_Bool bSet )
+ void SetVolatile( bool bSet )
{
aVolatile = bSet;
if( bSet )
- aCachable = sal_False;
+ aCachable = false;
}
- void SetToggle( sal_Bool bSet )
+ void SetToggle( bool bSet )
{
aToggle = bSet;
}
- void SetAutoUpdate( sal_Bool bSet )
+ void SetAutoUpdate( bool bSet )
{
aAutoUpdate = bSet;
}
- void SetSynchron( sal_Bool bSet )
+ void SetSynchron( bool bSet )
{
aSynchron = bSet;
if( bSet )
- aAsynchron = sal_False;
+ aAsynchron = false;
}
- void SetAsynchron( sal_Bool bSet )
+ void SetAsynchron( bool bSet )
{
aAsynchron = bSet;
if( bSet )
- aSynchron = sal_False;
+ aSynchron = false;
}
- void SetRecordPerItem( sal_Bool bSet )
+ void SetRecordPerItem( bool bSet )
{
aRecordPerItem = bSet;
if( bSet )
- aRecordPerSet = aRecordManual = aNoRecord = sal_False;
+ aRecordPerSet = aRecordManual = aNoRecord = false;
}
- void SetRecordPerSet( sal_Bool bSet )
+ void SetRecordPerSet( bool bSet )
{
aRecordPerSet = bSet;
if( bSet )
- aRecordPerItem = aRecordManual = aNoRecord = sal_False;
+ aRecordPerItem = aRecordManual = aNoRecord = false;
}
- void SetRecordManual( sal_Bool bSet )
+ void SetRecordManual( bool bSet )
{
aRecordManual = bSet;
if( bSet )
- aRecordPerItem = aRecordPerSet = aNoRecord = sal_False;
+ aRecordPerItem = aRecordPerSet = aNoRecord = false;
}
- void SetNoRecord( sal_Bool bSet )
+ void SetNoRecord( bool bSet )
{
aNoRecord = bSet;
if( bSet )
- aRecordPerItem = aRecordPerSet = aRecordManual = sal_False;
+ aRecordPerItem = aRecordPerSet = aRecordManual = false;
}
- void SetRecordAbsolute( sal_Bool bSet )
+ void SetRecordAbsolute( bool bSet )
{ aRecordAbsolute = bSet; }
- void SetHasDialog( sal_Bool bSet )
+ void SetHasDialog( bool bSet )
{ aHasDialog = bSet; }
- void SetMenuConfig( sal_Bool bSet )
+ void SetMenuConfig( bool bSet )
{ aMenuConfig = bSet; }
- void SetToolBoxConfig( sal_Bool bSet )
+ void SetToolBoxConfig( bool bSet )
{ aToolBoxConfig = bSet; }
- void SetStatusBarConfig( sal_Bool bSet )
+ void SetStatusBarConfig( bool bSet )
{ aStatusBarConfig = bSet; }
- void SetAccelConfig( sal_Bool bSet )
+ void SetAccelConfig( bool bSet )
{ aAccelConfig = bSet; }
- void SetAllConfig( sal_Bool bSet )
+ void SetAllConfig( bool bSet )
{
aMenuConfig = bSet;
aToolBoxConfig = bSet;
aStatusBarConfig = bSet;
aAccelConfig = bSet;
}
- void SetFastCall( sal_Bool bSet )
+ void SetFastCall( bool bSet )
{ aFastCall = bSet; }
- void SetContainer( sal_Bool bSet )
+ void SetContainer( bool bSet )
{ aContainer = bSet; }
- void SetImageRotation( sal_Bool bSet )
+ void SetImageRotation( bool bSet )
{ aImageRotation = bSet; }
- void SetImageReflection( sal_Bool bSet )
+ void SetImageReflection( bool bSet )
{ aImageReflection = bSet; }
public:
@@ -175,45 +175,45 @@ public:
SvMetaSlot();
SvMetaSlot( SvMetaType * pType );
- virtual sal_Bool IsVariable() const SAL_OVERRIDE;
- virtual sal_Bool IsMethod() const SAL_OVERRIDE;
- virtual OString GetMangleName( sal_Bool bVariable ) const SAL_OVERRIDE;
+ virtual bool IsVariable() const SAL_OVERRIDE;
+ virtual bool IsMethod() const SAL_OVERRIDE;
+ virtual OString GetMangleName( bool bVariable ) const SAL_OVERRIDE;
SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const;
- sal_Bool GetHasCoreId() const;
+ bool GetHasCoreId() const;
const OString& GetGroupId() const;
const OString& GetConfigId() const;
const OString& GetExecMethod() const;
const OString& GetStateMethod() const;
const OString& GetDefault() const;
const OString& GetDisableFlags() const;
- sal_Bool GetPseudoSlots() const;
- sal_Bool GetCachable() const;
- sal_Bool GetVolatile() const;
- sal_Bool GetToggle() const;
- sal_Bool GetAutoUpdate() const;
+ bool GetPseudoSlots() const;
+ bool GetCachable() const;
+ bool GetVolatile() const;
+ bool GetToggle() const;
+ bool GetAutoUpdate() const;
- sal_Bool GetSynchron() const;
- sal_Bool GetAsynchron() const;
+ bool GetSynchron() const;
+ bool GetAsynchron() const;
- sal_Bool GetRecordPerItem() const;
- sal_Bool GetRecordPerSet() const;
- sal_Bool GetRecordManual() const;
- sal_Bool GetNoRecord() const;
- sal_Bool GetRecordAbsolute() const;
+ bool GetRecordPerItem() const;
+ bool GetRecordPerSet() const;
+ bool GetRecordManual() const;
+ bool GetNoRecord() const;
+ bool GetRecordAbsolute() const;
- sal_Bool GetHasDialog() const;
+ bool GetHasDialog() const;
const OString& GetPseudoPrefix() const;
const OString& GetUnoName() const;
- sal_Bool GetMenuConfig() const;
- sal_Bool GetToolBoxConfig() const;
- sal_Bool GetStatusBarConfig() const;
- sal_Bool GetAccelConfig() const;
- sal_Bool GetFastCall() const;
- sal_Bool GetContainer() const;
- sal_Bool GetImageRotation() const;
- sal_Bool GetImageReflection() const;
+ bool GetMenuConfig() const;
+ bool GetToolBoxConfig() const;
+ bool GetStatusBarConfig() const;
+ bool GetAccelConfig() const;
+ bool GetFastCall() const;
+ bool GetContainer() const;
+ bool GetImageRotation() const;
+ bool GetImageReflection() const;
SvMetaSlot* GetLinkedSlot() const
{ return pLinkedSlot; }
SvMetaSlot* GetNextSlot() const
@@ -227,12 +227,12 @@ public:
SvMetaEnumValue* GetEnumValue() const
{ return pEnumValue; }
- virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void Insert( SvSlotElementList&, const OString& rPrefix,
@@ -247,7 +247,7 @@ public:
const OString&,
SvIdlDataBase & rBase,
SvStream & rOutStm );
- sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
+ sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvStream & rOutStm );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
HelpIdTable& rIdTable ) SAL_OVERRIDE;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 077b8768980b..4b08f7143e9c 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -44,12 +44,12 @@ class SvMetaAttribute : public SvMetaReference
SvBOOL aIsCollection;
SvBOOL aReadOnlyDoc;
SvBOOL aHidden;
- sal_Bool bNewAttr;
+ bool bNewAttr;
protected:
virtual void WriteCSource( SvIdlDataBase & rBase,
- SvStream & rOutStm, sal_Bool bSet );
- sal_uLong MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const;
+ SvStream & rOutStm, bool bSet );
+ sal_uLong MakeSlotValue( SvIdlDataBase & rBase, bool bVariable ) const;
virtual void WriteAttributes( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
@@ -62,45 +62,45 @@ public:
SvMetaAttribute();
SvMetaAttribute( SvMetaType * );
- void SetNewAttribute( sal_Bool bNew )
+ void SetNewAttribute( bool bNew )
{ bNewAttr = bNew; }
- sal_Bool IsNewAttribute() const
+ bool IsNewAttribute() const
{ return bNewAttr; }
- sal_Bool GetReadonly() const;
+ bool GetReadonly() const;
void SetSlotId( const SvNumberIdentifier & rId )
{ aSlotId = rId; }
const SvNumberIdentifier & GetSlotId() const;
- void SetExport( sal_Bool bSet )
+ void SetExport( bool bSet )
{ aExport = bSet; }
- sal_Bool GetExport() const;
+ bool GetExport() const;
- void SetHidden( sal_Bool bSet )
+ void SetHidden( bool bSet )
{ aHidden = bSet; }
- sal_Bool GetHidden() const;
+ bool GetHidden() const;
- void SetAutomation( sal_Bool bSet )
+ void SetAutomation( bool bSet )
{ aAutomation = bSet; }
- sal_Bool GetAutomation() const;
+ bool GetAutomation() const;
- void SetIsCollection( sal_Bool bSet )
+ void SetIsCollection( bool bSet )
{ aIsCollection = bSet; }
- sal_Bool GetIsCollection() const;
- void SetReadOnlyDoc( sal_Bool bSet )
+ bool GetIsCollection() const;
+ void SetReadOnlyDoc( bool bSet )
{ aReadOnlyDoc = bSet; }
- sal_Bool GetReadOnlyDoc() const;
+ bool GetReadOnlyDoc() const;
void SetType( SvMetaType * pT ) { aType = pT; }
SvMetaType * GetType() const;
- virtual sal_Bool IsMethod() const;
- virtual sal_Bool IsVariable() const;
- virtual OString GetMangleName( sal_Bool bVariable ) const;
+ virtual bool IsMethod() const;
+ virtual bool IsVariable() const;
+ virtual OString GetMangleName( bool bVariable ) const;
- virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType );
@@ -140,14 +140,14 @@ class SvMetaType : public SvMetaExtern
SvIdentifier aBasicName;
SvMetaAttributeMemberList * pAttrList;
int nType;
- sal_Bool bIsItem;
- sal_Bool bIsShell;
+ bool bIsItem;
+ bool bIsShell;
char cParserChar;
void WriteSfxItem( const OString& rItemName, SvIdlDataBase & rBase,
SvStream & rOutStm );
protected:
- sal_Bool ReadNamesSvIdl( SvIdlDataBase & rBase,
+ bool ReadNamesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
@@ -160,7 +160,7 @@ protected:
WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
- sal_Bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
void WriteHeaderSvIdl( SvIdlDataBase &, SvStream & rOutStm,
sal_uInt16 nTab );
public:
@@ -187,14 +187,14 @@ public:
int GetType() const { return nType; }
SvMetaType * GetBaseType() const;
SvMetaType * GetReturnType() const;
- sal_Bool IsItem() const { return bIsItem; }
- sal_Bool IsShell() const { return bIsShell; }
+ bool IsItem() const { return bIsItem; }
+ bool IsShell() const { return bIsShell; }
- void SetIn( sal_Bool b ) { aIn = b; }
- sal_Bool GetIn() const;
+ void SetIn( bool b ) { aIn = b; }
+ bool GetIn() const;
- void SetOut( sal_Bool b ) { aOut = b; }
- sal_Bool GetOut() const;
+ void SetOut( bool b ) { aOut = b; }
+ bool GetOut() const;
void SetCall0( int e );
int GetCall0() const;
@@ -213,26 +213,26 @@ public:
const OString& GetCName() const;
char GetParserChar() const { return cParserChar; }
- virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE;
+ virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE;
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
- OString GetCString() const;
+ OString GetCString() const;
void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
sal_uLong MakeSfx( OStringBuffer& rAtrrArray );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
- sal_Bool ReadMethodArgs( SvIdlDataBase & rBase,
+ bool ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
void WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
- OString GetParserString() const;
+ OString GetParserString() const;
void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
const OString& rChief );
};
@@ -256,7 +256,7 @@ public:
SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
SvMetaEnumValue();
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
@@ -279,13 +279,13 @@ public:
SV_DECL_META_FACTORY1( SvMetaTypeEnum, SvMetaType, 21 )
SvMetaTypeEnum();
- sal_uInt16 GetMaxValue() const;
- sal_uLong Count() const { return aEnumValueList.size(); }
- const OString& GetPrefix() const { return aPrefix; }
+ sal_uInt16 GetMaxValue() const;
+ sal_uLong Count() const { return aEnumValueList.size(); }
+ const OString& GetPrefix() const { return aPrefix; }
SvMetaEnumValue * GetObject( sal_uLong n ) const
{ return aEnumValueList[n]; }
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
+ virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm,
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index de253b6b817d..4e41c8932e4a 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -41,7 +41,7 @@ SvHashTable::~SvHashTable()
{
}
-sal_Bool SvHashTable::Test_Insert( const OString& rElement, sal_Bool bInsert,
+bool SvHashTable::Test_Insert( const OString& rElement, bool bInsert,
sal_uInt32 * pInsertPos )
{
sal_uInt32 nHash;
@@ -61,7 +61,7 @@ sal_Bool SvHashTable::Test_Insert( const OString& rElement, sal_Bool bInsert,
{
if( pInsertPos )
*pInsertPos = nIndex; // place of Element
- return sal_True;
+ return true;
}
nLoop++;
lTry++;
@@ -75,10 +75,10 @@ sal_Bool SvHashTable::Test_Insert( const OString& rElement, sal_Bool bInsert,
{
nFill++;
*pInsertPos = nIndex; // return free place
- return sal_True;
+ return true;
}
}
- return( sal_False );
+ return false;
}
SvStringHashTable::SvStringHashTable( sal_uInt32 nMaxEntries )
@@ -149,30 +149,30 @@ OString SvStringHashTable::GetNearString( const OString& rName ) const
return OString();
}
-sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
+bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
{
if( nIndex >= GetMax() )
- return sal_False;
+ return false;
return pEntries[ nIndex ].HasId();
}
-sal_Bool SvStringHashTable::Insert( const OString& rName, sal_uInt32 * pIndex )
+bool SvStringHashTable::Insert( const OString& rName, sal_uInt32 * pIndex )
{
sal_uInt32 nIndex;
if( !pIndex ) pIndex = &nIndex;
- if( !SvHashTable::Test_Insert( rName, sal_True, pIndex ) )
- return sal_False;
+ if( !SvHashTable::Test_Insert( rName, true, pIndex ) )
+ return false;
if( !IsEntry( *pIndex ) )
pEntries[ *pIndex ] = SvStringHashEntry( rName, *pIndex );
- return sal_True;
+ return true;
}
-sal_Bool SvStringHashTable::Test( const OString& rName, sal_uInt32 * pPos ) const
+bool SvStringHashTable::Test( const OString& rName, sal_uInt32 * pPos ) const
{
- return const_cast<SvStringHashTable*>(this)->Test_Insert( rName, sal_False, pPos );
+ return const_cast<SvStringHashTable*>(this)->Test_Insert( rName, false, pPos );
}
SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 23793a661882..e5fa39cb65dd 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -210,7 +210,7 @@ sal_uLong SvTokenStream::GetNumber()
return( l );
}
-sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
+bool SvTokenStream::MakeToken( SvToken & rToken )
{
do
{
@@ -253,7 +253,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
{
c = GetNextChar();
if( IsEof() )
- return sal_False;
+ return false;
}
else
c = GetFastNextChar();
@@ -262,7 +262,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
}
while( '/' != c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) )
- return sal_False;
+ return false;
c = GetNextChar();
rToken.nType = SVTOKEN_COMMENT;
CalcColumn();
@@ -276,7 +276,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
else if( c == '"' )
{
OStringBuffer aStr;
- sal_Bool bDone = sal_False;
+ bool bDone = false;
while( !bDone && !IsEof() && c )
{
c = GetFastNextChar();
@@ -286,7 +286,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
aStr.append('\n');
c = GetNextChar();
if( IsEof() )
- return sal_False;
+ return false;
}
if( c == '"' )
{
@@ -297,7 +297,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
aStr.append('"');
}
else
- bDone = sal_True;
+ bDone = true;
}
else if( c == '\\' )
{
@@ -310,7 +310,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
aStr.append(static_cast<char>(c));
}
if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) )
- return sal_False;
+ return false;
rToken.nType = SVTOKEN_STRING;
rToken.aString = aStr.makeStringAndClear();
}
@@ -332,12 +332,12 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
if( aStr.equalsIgnoreAsciiCase( aStrTrue ) )
{
rToken.nType = SVTOKEN_BOOL;
- rToken.bBool = sal_True;
+ rToken.bBool = true;
}
else if( aStr.equalsIgnoreAsciiCase( aStrFalse ) )
{
rToken.nType = SVTOKEN_BOOL;
- rToken.bBool = sal_False;
+ rToken.bBool = false;
}
else
{
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 08b812970535..666d1cbdf106 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -55,18 +55,18 @@ void SvMetaObject::WriteStars( SvStream & rOutStm )
rOutStm.WriteChar( '/' ) << endl;
}
-sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
+bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
{
// write no empty brackets
sal_uLong nPos = rOutStm.Tell();
rOutStm.Seek( nBegPos );
- sal_Bool bOnlySpace = sal_True;
+ bool bOnlySpace = true;
while( bOnlySpace && rOutStm.Tell() < nPos )
{
char c;
rOutStm.ReadChar( c );
if( !isspace( c ) )
- bOnlySpace = sal_False;
+ bOnlySpace = false;
}
if( bOnlySpace )
// nothing written
@@ -96,9 +96,9 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
rOutStm.Seek( nPos );
}
-sal_Bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
+bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
{
- return sal_False;
+ return false;
}
void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
@@ -152,13 +152,13 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( nMask & 0x10 ) WriteSvString( rStm, aDescription );
}
-sal_Bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * )
+bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * )
{
aName.setString(rName);
- return sal_True;
+ return true;
}
-sal_Bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
+bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
@@ -167,10 +167,10 @@ sal_Bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
// read module name
if( pTok->IsIdentifier() )
if( SetName( pTok->GetString(), &rBase ) )
- return sal_True;
+ return true;
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
@@ -208,9 +208,9 @@ void SvMetaName::ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & )
{
}
-sal_Bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
+bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
{
- return sal_True;
+ return true;
}
void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 )
@@ -263,10 +263,10 @@ void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
}
}
-sal_Bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
- sal_Bool bOk = sal_True;
+ bool bOk = true;
if( rInStm.Read( '[' ) )
{
sal_uInt32 nBeginPos = 0; // can not happen with Tell
@@ -343,13 +343,13 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
// write no empty brackets
sal_uLong nPos = rOutStm.Tell();
rOutStm.Seek( nOldPos );
- sal_Bool bOnlySpace = sal_True;
+ bool bOnlySpace = true;
while( bOnlySpace && rOutStm.Tell() < nPos )
{
char c;
rOutStm.ReadChar( c );
if( !isspace( c ) )
- bOnlySpace = sal_False;
+ bOnlySpace = false;
}
if( bOnlySpace )
// nothing written
@@ -435,8 +435,8 @@ SV_IMPL_META_FACTORY1( SvMetaExtern, SvMetaReference );
SvMetaExtern::SvMetaExtern()
: pModule( NULL )
- , bReadUUId( sal_False )
- , bReadVersion( sal_False )
+ , bReadUUId( false )
+ , bReadVersion( false )
{
}
@@ -455,8 +455,8 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
if( nMask & 0x01 ) rStm >> pModule;
if( nMask & 0x02 ) rStm >> aUUId;
if( nMask & 0x04 ) rStm >> aVersion;
- if( nMask & 0x08 ) bReadUUId = sal_True;
- if( nMask & 0x10 ) bReadVersion = sal_True;
+ if( nMask & 0x08 ) bReadUUId = true;
+ if( nMask & 0x10 ) bReadVersion = true;
}
void SvMetaExtern::Save( SvPersistStream & rStm )
@@ -501,9 +501,9 @@ void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase,
{
SvMetaReference::ReadAttributesSvIdl( rBase, rInStm );
if( aUUId.ReadSvIdl( rBase, rInStm ) )
- bReadUUId = sal_True;
+ bReadUUId = true;
if( aVersion.ReadSvIdl( rInStm ) )
- bReadVersion = sal_True;
+ bReadVersion = true;
}
void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
@@ -530,7 +530,7 @@ void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
}
}
-sal_Bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
SetModule( rBase );
GetUUId(); // id gets created
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 5c1bb40b9652..b24f79544d32 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -26,14 +26,14 @@
#include <hash.hxx>
#include <database.hxx>
-static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
+static bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
- sal_Bool bOk = sal_False;
+ bool bOk = false;
if( rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken_Next();
@@ -43,17 +43,17 @@ static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInSt
if ( n >= nMin && n <= nMax )
{
*pValue = n;
- bOk = sal_True;
+ bOk = true;
}
}
}
if( bOk )
- return sal_True;
+ return true;
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
sal_uInt32 SvUINT32::Read( SvStream & rStm )
@@ -127,15 +127,15 @@ SvStream& operator >> (SvStream & rStm, SvVersion & r )
}
-sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
- sal_Bool bOk = sal_True;
- sal_Bool bBraket = rInStm.Read( '(' );
+ bool bOk = true;
+ bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken();
@@ -149,21 +149,21 @@ sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
bOk = rInStm.Read( ')' );
}
else
- *this = sal_True; //default action set to TRUE
+ *this = true; //default action set to TRUE
if( bOk )
- return sal_True;
+ return true;
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
-sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
+bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
{
if( nVal )
rOutStm.WriteCharPtr( pName->GetName().getStr() );
else
rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteCharPtr( "(FALSE)" );
- return sal_True;
+ return true;
}
OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
@@ -176,15 +176,15 @@ OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
makeStringAndClear();
}
-sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
- sal_Bool bOk = sal_True;
- sal_Bool bBraket = rInStm.Read( '(' );
+ bool bOk = true;
+ bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken();
@@ -197,19 +197,19 @@ sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rIn
bOk = rInStm.Read( ')' );
}
if( bOk )
- return sal_True;
+ return true;
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
-sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
+bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
SvStream & rOutStm,
sal_uInt16 /*nTab */ )
{
rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteChar( '(' );
rOutStm.WriteCharPtr( getString().getStr() ).WriteChar( ')' );
- return sal_True;
+ return true;
}
SvStream& WriteSvIdentifier(SvStream & rStm, const SvIdentifier & r )
@@ -225,7 +225,7 @@ SvStream& operator >> (SvStream & rStm, SvIdentifier & r )
}
-sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
SvStringHashEntry * pName,
SvTokenStream & rInStm )
{
@@ -235,7 +235,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
if( rBase.FindId( getString(), &n ) )
{
nValue = n;
- return sal_True;
+ return true;
}
else
{
@@ -245,10 +245,10 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
rBase.WriteError( rInStm );
}
}
- return sal_False;
+ return false;
}
-sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
@@ -261,7 +261,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
{
setString(pTok->GetString());
nValue = n;
- return sal_True;
+ return true;
}
else
{
@@ -272,7 +272,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
}
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
SvStream& WriteSvNumberIdentifier(SvStream & rStm, const SvNumberIdentifier & r )
@@ -290,15 +290,15 @@ SvStream& operator >> (SvStream & rStm, SvNumberIdentifier & r )
}
-sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
- sal_Bool bOk = sal_True;
- sal_Bool bBraket = rInStm.Read( '(' );
+ bool bOk = true;
+ bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken();
@@ -311,18 +311,18 @@ sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
bOk = rInStm.Read( ')' );
}
if( bOk )
- return sal_True;
+ return true;
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
-sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
sal_uInt16 /*nTab */ )
{
rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteCharPtr( "(\"" );
rOutStm.WriteCharPtr( m_aStr.getStr() ).WriteCharPtr( "\")" );
- return sal_True;
+ return true;
}
SvStream& WriteSvString(SvStream & rStm, const SvString & r )
@@ -338,25 +338,25 @@ SvStream& operator >> (SvStream & rStm, SvString & r )
}
-sal_Bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
+bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
{
return SvString::ReadSvIdl( SvHash_HelpText(), rInStm );
}
-sal_Bool SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab )
+bool SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab )
{
return SvString::WriteSvIdl( SvHash_HelpText(), rOutStm, nTab );
}
-sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
+bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( SvHash_uuid() ) )
{
- sal_Bool bOk = sal_True;
- sal_Bool bBraket = rInStm.Read( '(' );
+ bool bOk = true;
+ bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken();
@@ -369,22 +369,22 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
bOk = rInStm.Read( ')' );
}
if( bOk )
- return sal_True;
+ return true;
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
-sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
+bool SvUUId::WriteSvIdl( SvStream & rOutStm )
{
// write global id
rOutStm.WriteCharPtr( SvHash_uuid()->GetName().getStr() ).WriteCharPtr( "(\"" );
rOutStm.WriteCharPtr( OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() ).WriteCharPtr( "\")" );
- return sal_True;
+ return true;
}
-sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
+bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
{
sal_uLong n = 0;
@@ -398,24 +398,24 @@ sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
if( pTok->IsInteger() && pTok->GetNumber() <= 0xFFFF )
{
nMinorVersion = (sal_uInt16)pTok->GetNumber();
- return sal_True;
+ return true;
}
}
else
- return sal_True;
+ return true;
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
-sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm )
+bool SvVersion::WriteSvIdl( SvStream & rOutStm )
{
rOutStm.WriteCharPtr( SvHash_Version()->GetName().getStr() ).WriteChar( '(' )
.WriteCharPtr( OString::number(nMajorVersion).getStr() )
.WriteChar( '.' )
.WriteCharPtr( OString::number(nMinorVersion).getStr() )
.WriteChar( ')' );
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 2d3b9c5c7075..78ca274c3904 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -30,21 +30,21 @@
SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern );
SvMetaModule::SvMetaModule()
- : bImported( sal_False )
- , bIsModified( sal_False )
+ : bImported( false )
+ , bIsModified( false )
{
}
-SvMetaModule::SvMetaModule( const OUString & rIdlFileName, sal_Bool bImp )
+SvMetaModule::SvMetaModule( const OUString & rIdlFileName, bool bImp )
: aIdlFileName( rIdlFileName )
- , bImported( bImp ), bIsModified( sal_False )
+ , bImported( bImp ), bIsModified( false )
{
}
#define MODULE_VER 0x0001
void SvMetaModule::Load( SvPersistStream & rStm )
{
- bImported = sal_True; // import always
+ bImported = true; // import always
SvMetaExtern::Load( rStm );
sal_uInt16 nVer;
@@ -100,27 +100,27 @@ void SvMetaModule::Save( SvPersistStream & rStm )
rStm.Seek( nPos );
}
-sal_Bool SvMetaModule::SetName( const OString& rName, SvIdlDataBase * pBase )
+bool SvMetaModule::SetName( const OString& rName, SvIdlDataBase * pBase )
{
if( pBase )
{
if( pBase->GetModule( rName ) )
- return sal_False;
+ return false;
}
return SvMetaExtern::SetName( rName );
}
-sal_Bool SvMetaModule::FillNextName( SvGlobalName * pName )
+bool SvMetaModule::FillNextName( SvGlobalName * pName )
{
*pName = aNextName;
if( aNextName < aEndName )
{
++aNextName;
- bIsModified = sal_True;
- return sal_True;
+ bIsModified = true;
+ return true;
}
- return sal_False;
+ return false;
}
void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
@@ -217,7 +217,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
else if( rInStm.GetToken()->Is( SvHash_include() ) )
{
- sal_Bool bOk = sal_False;
+ bool bOk = false;
rInStm.GetToken_Next();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
@@ -313,13 +313,13 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
}
}
-sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
- bIsModified = sal_True; // up to now always when compiler running
+ bIsModified = true; // up to now always when compiler running
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
- sal_Bool bOk = pTok->Is( SvHash_module() );
+ bool bOk = pTok->Is( SvHash_module() );
if( bOk )
{
pTok = rInStm.GetToken_Next();
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index d549d8fecbd9..81716c2fa1ac 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -70,7 +70,7 @@ void SvClassElement::Save( SvPersistStream & rStm )
SV_IMPL_META_FACTORY1( SvMetaClass, SvMetaType );
SvMetaClass::SvMetaClass()
- : aAutomation( sal_True, sal_False )
+ : aAutomation( true, false )
{
}
@@ -179,7 +179,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
rBase.WriteError( rInStm );
}
xAutomationInterface = pClass;
- xEle->SetAutomation( sal_True );
+ xEle->SetAutomation( true );
}
else
{
@@ -216,7 +216,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
rInStm.Seek( nTokPos );
SvMetaType * pType = rBase.ReadKnownType( rInStm );
- sal_Bool bOk = sal_False;
+ bool bOk = false;
SvMetaAttributeRef xAttr;
if( !pType || pType->IsItem() )
{
@@ -277,12 +277,12 @@ void SvMetaClass::WriteContextSvIdl
}
}
-sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
sal_uLong nTokPos = rInStm.Tell();
if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_CLASS )
{
- sal_Bool bOk = sal_True;
+ bool bOk = true;
if( rInStm.Read( ':' ) )
{
aSuperClass = rBase.ReadKnownClass( rInStm );
@@ -304,10 +304,10 @@ sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
return bOk;
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
-sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const
{
if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) )
@@ -334,7 +334,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
aStr.append(" with different id's");
rBase.SetError(aStr.makeStringAndClear(), rInStm.GetToken());
rBase.WriteError( rInStm );
- return sal_False;
+ return false;
}
}
else
@@ -355,14 +355,14 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
aStr.append(" with equal id's");
rBase.SetError(aStr.makeStringAndClear(), rInStm.GetToken());
rBase.WriteError( rInStm );
- return sal_False;
+ return false;
}
}
}
SvMetaClass * pSC = aSuperClass;
if( pSC )
return pSC->TestAttribute( rBase, rInStm, rAttr );
- return sal_True;
+ return true;
}
void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 21ae92287924..538d0af4dce6 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -34,10 +34,10 @@ SvMetaObject *SvMetaSlot::MakeClone() const
}
SvMetaSlot::SvMetaSlot()
- : aCachable( sal_True, sal_False )
- , aSynchron( sal_True, sal_False )
- , aRecordPerSet( sal_True, sal_False )
- , aRecordAbsolute( sal_False, sal_False )
+ : aCachable( true, false )
+ , aSynchron( true, false )
+ , aRecordPerSet( true, false )
+ , aRecordAbsolute( false, false )
, pLinkedSlot(0)
, pNextSlot(0)
, nListPos(0)
@@ -47,10 +47,10 @@ SvMetaSlot::SvMetaSlot()
SvMetaSlot::SvMetaSlot( SvMetaType * pType )
: SvMetaAttribute( pType )
- , aCachable( sal_True, sal_False )
- , aSynchron( sal_True, sal_False )
- , aRecordPerSet( sal_True, sal_False )
- , aRecordAbsolute( sal_False, sal_False )
+ , aCachable( true, false )
+ , aSynchron( true, false )
+ , aRecordPerSet( true, false )
+ , aRecordAbsolute( false, false )
, pLinkedSlot(0)
, pNextSlot(0)
, nListPos(0)
@@ -281,19 +281,19 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
if( nMask & 0x0002 ) rStm.WriteUChar( aImageReflection );
}
-sal_Bool SvMetaSlot::IsVariable() const
+bool SvMetaSlot::IsVariable() const
{
return SvMetaAttribute::IsVariable();
}
-sal_Bool SvMetaSlot::IsMethod() const
+bool SvMetaSlot::IsMethod() const
{
bool b = SvMetaAttribute::IsMethod();
b |= NULL != GetMethod();
return b;
}
-OString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
+OString SvMetaSlot::GetMangleName( bool bVariable ) const
{
if( !bVariable )
{
@@ -321,7 +321,7 @@ SvMetaAttribute * SvMetaSlot::GetMethod() const
if( aMethod.Is() || !GetRef() ) return aMethod;
return ((SvMetaSlot *)GetRef())->GetMethod();
}
-sal_Bool SvMetaSlot::GetHasCoreId() const
+bool SvMetaSlot::GetHasCoreId() const
{
if( aHasCoreId.IsSet() || !GetRef() ) return aHasCoreId;
return ((SvMetaSlot *)GetRef())->GetHasCoreId();
@@ -356,50 +356,50 @@ const OString& SvMetaSlot::GetDefault() const
if( !aDefault.getString().isEmpty() || !GetRef() ) return aDefault.getString();
return ((SvMetaSlot *)GetRef())->GetDefault();
}
-sal_Bool SvMetaSlot::GetPseudoSlots() const
+bool SvMetaSlot::GetPseudoSlots() const
{
if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots;
return ((SvMetaSlot *)GetRef())->GetPseudoSlots();
}
-sal_Bool SvMetaSlot::GetCachable() const
+bool SvMetaSlot::GetCachable() const
{
// Cachable and Volatile are exclusive
if( !GetRef() || aCachable.IsSet() || aVolatile.IsSet() )
return aCachable;
return ((SvMetaSlot *)GetRef())->GetCachable();
}
-sal_Bool SvMetaSlot::GetVolatile() const
+bool SvMetaSlot::GetVolatile() const
{
// Cachable and Volatile are exclusive
if( !GetRef() || aVolatile.IsSet() || aCachable.IsSet() )
return aVolatile;
return ((SvMetaSlot *)GetRef())->GetVolatile();
}
-sal_Bool SvMetaSlot::GetToggle() const
+bool SvMetaSlot::GetToggle() const
{
if( aToggle.IsSet() || !GetRef() ) return aToggle;
return ((SvMetaSlot *)GetRef())->GetToggle();
}
-sal_Bool SvMetaSlot::GetAutoUpdate() const
+bool SvMetaSlot::GetAutoUpdate() const
{
if( aAutoUpdate.IsSet() || !GetRef() ) return aAutoUpdate;
return ((SvMetaSlot *)GetRef())->GetAutoUpdate();
}
-sal_Bool SvMetaSlot::GetSynchron() const
+bool SvMetaSlot::GetSynchron() const
{
// Synchron and Asynchron are exclusive
if( !GetRef() || aSynchron.IsSet() || aAsynchron.IsSet() )
return aSynchron;
return ((SvMetaSlot *)GetRef())->GetSynchron();
}
-sal_Bool SvMetaSlot::GetAsynchron() const
+bool SvMetaSlot::GetAsynchron() const
{
// Synchron and Asynchron are exclusive
if( !GetRef() || aAsynchron.IsSet() || aSynchron.IsSet() )
return aAsynchron;
return ((SvMetaSlot *)GetRef())->GetAsynchron();
}
-sal_Bool SvMetaSlot::GetRecordPerItem() const
+bool SvMetaSlot::GetRecordPerItem() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -407,7 +407,7 @@ sal_Bool SvMetaSlot::GetRecordPerItem() const
return aRecordPerItem;
return ((SvMetaSlot *)GetRef())->GetRecordPerItem();
}
-sal_Bool SvMetaSlot::GetRecordPerSet() const
+bool SvMetaSlot::GetRecordPerSet() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -415,7 +415,7 @@ sal_Bool SvMetaSlot::GetRecordPerSet() const
return aRecordPerSet;
return ((SvMetaSlot *)GetRef())->GetRecordPerSet();
}
-sal_Bool SvMetaSlot::GetRecordManual() const
+bool SvMetaSlot::GetRecordManual() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -423,7 +423,7 @@ sal_Bool SvMetaSlot::GetRecordManual() const
return aRecordManual;
return ((SvMetaSlot *)GetRef())->GetRecordManual();
}
-sal_Bool SvMetaSlot::GetNoRecord() const
+bool SvMetaSlot::GetNoRecord() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -431,13 +431,13 @@ sal_Bool SvMetaSlot::GetNoRecord() const
return aNoRecord;
return ((SvMetaSlot *)GetRef())->GetNoRecord();
}
-sal_Bool SvMetaSlot::GetRecordAbsolute() const
+bool SvMetaSlot::GetRecordAbsolute() const
{
if( !GetRef() || aRecordAbsolute.IsSet() )
return aRecordAbsolute;
return ((SvMetaSlot *)GetRef())->GetRecordAbsolute();
}
-sal_Bool SvMetaSlot::GetHasDialog() const
+bool SvMetaSlot::GetHasDialog() const
{
if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog;
return ((SvMetaSlot *)GetRef())->GetHasDialog();
@@ -447,44 +447,44 @@ const OString& SvMetaSlot::GetPseudoPrefix() const
if( !aPseudoPrefix.getString().isEmpty() || !GetRef() ) return aPseudoPrefix.getString();
return ((SvMetaSlot *)GetRef())->GetPseudoPrefix();
}
-sal_Bool SvMetaSlot::GetMenuConfig() const
+bool SvMetaSlot::GetMenuConfig() const
{
if( aMenuConfig.IsSet() || !GetRef() ) return aMenuConfig;
return ((SvMetaSlot *)GetRef())->GetMenuConfig();
}
-sal_Bool SvMetaSlot::GetToolBoxConfig() const
+bool SvMetaSlot::GetToolBoxConfig() const
{
if( aToolBoxConfig.IsSet() || !GetRef() ) return aToolBoxConfig;
return ((SvMetaSlot *)GetRef())->GetToolBoxConfig();
}
-sal_Bool SvMetaSlot::GetStatusBarConfig() const
+bool SvMetaSlot::GetStatusBarConfig() const
{
if( aStatusBarConfig.IsSet() || !GetRef() ) return aStatusBarConfig;
return ((SvMetaSlot *)GetRef())->GetStatusBarConfig();
}
-sal_Bool SvMetaSlot::GetAccelConfig() const
+bool SvMetaSlot::GetAccelConfig() const
{
if( aAccelConfig.IsSet() || !GetRef() ) return aAccelConfig;
return ((SvMetaSlot *)GetRef())->GetAccelConfig();
}
-sal_Bool SvMetaSlot::GetFastCall() const
+bool SvMetaSlot::GetFastCall() const
{
if( aFastCall.IsSet() || !GetRef() ) return aFastCall;
return ((SvMetaSlot *)GetRef())->GetFastCall();
}
-sal_Bool SvMetaSlot::GetContainer() const
+bool SvMetaSlot::GetContainer() const
{
if( aContainer.IsSet() || !GetRef() ) return aContainer;
return ((SvMetaSlot *)GetRef())->GetContainer();
}
-sal_Bool SvMetaSlot::GetImageRotation() const
+bool SvMetaSlot::GetImageRotation() const
{
if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation;
return ((SvMetaSlot *)GetRef())->GetImageRotation();
}
-sal_Bool SvMetaSlot::GetImageReflection() const
+bool SvMetaSlot::GetImageReflection() const
{
if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
return ((SvMetaSlot *)GetRef())->GetImageReflection();
@@ -501,7 +501,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
{
SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm );
- sal_Bool bOk = sal_False;
+ bool bOk = false;
bOk |= aDefault.ReadSvIdl( SvHash_Default(), rInStm );
bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm );
bOk |= aHasCoreId.ReadSvIdl( SvHash_HasCoreId(), rInStm );
@@ -525,29 +525,29 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
}
if( aCachable.ReadSvIdl( SvHash_Cachable(), rInStm ) )
- SetCachable( aCachable ), bOk = sal_True;
+ SetCachable( aCachable ), bOk = true;
if( aVolatile.ReadSvIdl( SvHash_Volatile(), rInStm ) )
- SetVolatile( aVolatile ), bOk = sal_True;
+ SetVolatile( aVolatile ), bOk = true;
if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) )
- SetToggle( aToggle ), bOk = sal_True;
+ SetToggle( aToggle ), bOk = true;
if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) )
- SetAutoUpdate( aAutoUpdate ), bOk = sal_True;
+ SetAutoUpdate( aAutoUpdate ), bOk = true;
if( aSynchron.ReadSvIdl( SvHash_Synchron(), rInStm ) )
- SetSynchron( aSynchron ), bOk = sal_True;
+ SetSynchron( aSynchron ), bOk = true;
if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) )
- SetAsynchron( aAsynchron ), bOk = sal_True;
+ SetAsynchron( aAsynchron ), bOk = true;
if( aRecordAbsolute.ReadSvIdl( SvHash_RecordAbsolute(), rInStm ) )
- SetRecordAbsolute( aRecordAbsolute), bOk = sal_True;
+ SetRecordAbsolute( aRecordAbsolute), bOk = true;
if( aRecordPerItem.ReadSvIdl( SvHash_RecordPerItem(), rInStm ) )
- SetRecordPerItem( aRecordPerItem ), bOk = sal_True;
+ SetRecordPerItem( aRecordPerItem ), bOk = true;
if( aRecordPerSet.ReadSvIdl( SvHash_RecordPerSet(), rInStm ) )
- SetRecordPerSet( aRecordPerSet ), bOk = sal_True;
+ SetRecordPerSet( aRecordPerSet ), bOk = true;
if( aRecordManual.ReadSvIdl( SvHash_RecordManual(), rInStm ) )
- SetRecordManual( aRecordManual ), bOk = sal_True;
+ SetRecordManual( aRecordManual ), bOk = true;
if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) )
- SetNoRecord( aNoRecord ), bOk = sal_True;
+ SetNoRecord( aNoRecord ), bOk = true;
bOk |= aHasDialog.ReadSvIdl( SvHash_HasDialog(), rInStm );
bOk |= aPseudoPrefix.ReadSvIdl( SvHash_PseudoPrefix(), rInStm );
@@ -558,7 +558,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvBOOL aAllConfig;
if( aAllConfig.ReadSvIdl( SvHash_AllConfig(), rInStm ) )
- SetAllConfig( aAllConfig ), bOk = sal_True;
+ SetAllConfig( aAllConfig ), bOk = true;
bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
@@ -573,7 +573,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( SvHash_SlotType() ) )
{
- sal_Bool bBraket = rInStm.Read( '(' );
+ bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
aSlotType = rBase.ReadKnownType( rInStm );
@@ -800,9 +800,9 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
}
-sal_Bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
- sal_Bool bOk = SvMetaAttribute::Test( rBase, rInStm );
+ bool bOk = SvMetaAttribute::Test( rBase, rInStm );
if( bOk )
{
SvMetaType * pType = GetType();
@@ -812,17 +812,17 @@ sal_Bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
rBase.SetError( "this attribute is not a slot", rInStm.GetToken() );
rBase.WriteError( rInStm );
- bOk = sal_False;
+ bOk = false;
}
}
return bOk;
}
-sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
- sal_Bool bOk = sal_True;
+ bool bOk = true;
SvMetaAttribute * pAttr = rBase.ReadKnownAttr( rInStm, GetType() );
if( pAttr )
@@ -842,7 +842,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
aStr.append(" is method or variable but not a slot");
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
rBase.WriteError( rInStm );
- bOk = sal_False;
+ bOk = false;
}
}
else
@@ -863,7 +863,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
OSL_FAIL("Illegal definition!");
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
SetName( pKnownSlot->GetName().getString(), &rBase );
@@ -875,7 +875,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
aStr.append(" is method or variable but not a slot");
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
rBase.WriteError( rInStm );
- bOk = sal_False;
+ bOk = false;
}
}
}
@@ -941,7 +941,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
{
sal_uInt16 nMid = 0, nLow = 0;
sal_uInt16 nHigh = nListCount - 1;
- sal_Bool bFound = sal_False;
+ bool bFound = false;
while ( !bFound && nLow <= nHigh )
{
nMid = (nLow + nHigh) >> 1;
@@ -960,7 +960,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
break;
}
else
- bFound = sal_True;
+ bFound = true;
}
DBG_ASSERT(!bFound, "Duplicate SlotId!");
@@ -1041,7 +1041,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
}
// The slaves are no master!
- xEnumSlot->aPseudoSlots = sal_False;
+ xEnumSlot->aPseudoSlots = false;
xEnumSlot->SetEnumValue(enumValue);
if ( !pFirstEnumSlot || xEnumSlot->GetSlotId().GetValue() < pFirstEnumSlot->GetSlotId().GetValue() )
@@ -1094,12 +1094,12 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
if ( !aMethodName.isEmpty() &&
aMethodName != "NoExec" )
{
- sal_Bool bIn = sal_False;
+ bool bIn = false;
for( size_t n = 0; n < rList.size(); n++ )
{
if (rList[n]->equals(aMethodName))
{
- bIn=sal_True;
+ bIn = true;
break;
}
}
@@ -1119,12 +1119,12 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
if (!aMethodName.isEmpty() &&
aMethodName != "NoState")
{
- sal_Bool bIn = sal_False;
+ bool bIn = false;
for ( size_t n=0; n < rList.size(); n++ )
{
if (rList[n]->equals(aMethodName))
{
- bIn=sal_True;
+ bIn = true;
break;
}
}
@@ -1151,7 +1151,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
if ( !GetExport() && !GetHidden() )
return;
- sal_Bool bIsEnumSlot = 0 != pEnumValue;
+ bool bIsEnumSlot = 0 != pEnumValue;
rOutStm.WriteCharPtr( "// Slot Nr. " )
.WriteCharPtr( OString::number(nListPos).getStr() )
@@ -1393,7 +1393,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
rOutStm.WriteChar( '.' );
if ( !IsVariable() || !GetType() ||
GetType()->GetBaseType()->GetType() != TYPE_STRUCT )
- rOutStm.WriteCharPtr( GetMangleName( sal_False ).getStr() );
+ rOutStm.WriteCharPtr( GetMangleName( false ).getStr() );
rOutStm.WriteCharPtr( "\"," );
}
else
@@ -1414,7 +1414,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
{
rOutStm.WriteCharPtr( ",\"" );
- rOutStm.WriteCharPtr( GetMangleName( sal_False ).getStr() );
+ rOutStm.WriteCharPtr( GetMangleName( false ).getStr() );
rOutStm.WriteCharPtr( "\"" );
}
@@ -1517,11 +1517,11 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
OString aSId = aBuf.makeStringAndClear();
sal_uLong nSId2;
- sal_Bool bIdOk = sal_False;
+ bool bIdOk = false;
if( rBase.FindId( aSId, &nSId2 ) )
{
aSId = OString::number(nSId2);
- bIdOk = sal_True;
+ bIdOk = true;
}
// if id not found, write always
@@ -1538,7 +1538,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-void WriteBool( sal_Bool bSet, SvStream& rStream )
+void WriteBool( bool bSet, SvStream& rStream )
{
if ( bSet )
rStream.WriteCharPtr( "TRUE" ).WriteChar( ',' );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 265be88a2a21..cf9cfa91cf88 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -29,23 +29,23 @@
SV_IMPL_META_FACTORY1( SvMetaAttribute, SvMetaReference );
SvMetaAttribute::SvMetaAttribute()
- : aAutomation( sal_True, sal_False )
- , aExport( sal_True, sal_False )
- , aIsCollection ( sal_False, sal_False )
- , aReadOnlyDoc ( sal_True, sal_False )
- , aHidden( sal_False, sal_False )
- , bNewAttr( sal_False )
+ : aAutomation( true, false )
+ , aExport( true, false )
+ , aIsCollection ( false, false )
+ , aReadOnlyDoc ( true, false )
+ , aHidden( false, false )
+ , bNewAttr( false )
{
}
SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
: aType( pType )
- , aAutomation( sal_True, sal_False )
- , aExport( sal_True, sal_False )
- , aIsCollection ( sal_False, sal_False)
- , aReadOnlyDoc ( sal_True, sal_False)
- , aHidden( sal_False, sal_False )
- , bNewAttr( sal_False )
+ , aAutomation( true, false )
+ , aExport( true, false )
+ , aIsCollection ( false, false)
+ , aReadOnlyDoc ( true, false)
+ , aHidden( false, false )
+ , bNewAttr( false )
{
}
@@ -109,19 +109,19 @@ const SvNumberIdentifier & SvMetaAttribute::GetSlotId() const
return ((SvMetaAttribute *)GetRef())->GetSlotId();
}
-sal_Bool SvMetaAttribute::GetReadonly() const
+bool SvMetaAttribute::GetReadonly() const
{
if( aReadonly.IsSet() || !GetRef() ) return aReadonly;
return ((SvMetaAttribute *)GetRef())->GetReadonly();
}
-sal_Bool SvMetaAttribute::GetExport() const
+bool SvMetaAttribute::GetExport() const
{
if( aExport.IsSet() || !GetRef() ) return aExport;
return ((SvMetaAttribute *)GetRef())->GetExport();
}
-sal_Bool SvMetaAttribute::GetHidden() const
+bool SvMetaAttribute::GetHidden() const
{
// when export is set, but hidden is not the default is used
if ( aExport.IsSet() && !aHidden.IsSet() )
@@ -132,15 +132,15 @@ sal_Bool SvMetaAttribute::GetHidden() const
return ((SvMetaAttribute *)GetRef())->GetHidden();
}
-sal_Bool SvMetaAttribute::GetAutomation() const
+bool SvMetaAttribute::GetAutomation() const
{
if( aAutomation.IsSet() || !GetRef() ) return aAutomation;
return ((SvMetaAttribute *)GetRef())->GetAutomation();
}
-sal_Bool SvMetaAttribute::GetIsCollection() const
+bool SvMetaAttribute::GetIsCollection() const
{
- sal_Bool bRet;
+ bool bRet;
if( aIsCollection.IsSet() || !GetRef() )
{
if ( aIsCollection.IsSet() )
@@ -155,57 +155,57 @@ sal_Bool SvMetaAttribute::GetIsCollection() const
return ((SvMetaSlot *)GetRef())->GetIsCollection();
}
-sal_Bool SvMetaAttribute::GetReadOnlyDoc() const
+bool SvMetaAttribute::GetReadOnlyDoc() const
{
if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc;
return ((SvMetaSlot *)GetRef())->GetReadOnlyDoc();
}
-sal_Bool SvMetaAttribute::IsMethod() const
+bool SvMetaAttribute::IsMethod() const
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
return pType->GetType() == TYPE_METHOD;
}
-sal_Bool SvMetaAttribute::IsVariable() const
+bool SvMetaAttribute::IsVariable() const
{
SvMetaType * pType = GetType();
return pType->GetType() != TYPE_METHOD;
}
-OString SvMetaAttribute::GetMangleName( sal_Bool ) const
+OString SvMetaAttribute::GetMangleName( bool ) const
{
return GetName().getString();
}
-sal_Bool SvMetaAttribute::Test( SvIdlDataBase & rBase,
+bool SvMetaAttribute::Test( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- sal_Bool bOk = sal_True;
+ bool bOk = true;
if( GetType()->IsItem() && !GetSlotId().IsSet() )
{
rBase.SetError( "slot without id declared", rInStm.GetToken() );
rBase.WriteError( rInStm );
- bOk = sal_False;
+ bOk = false;
}
return bOk;
}
-sal_Bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
- SvTokenStream & rInStm )
+bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
+ SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
if( !GetType() )
// no type in ctor passed on
aType = rBase.ReadKnownType( rInStm );
- sal_Bool bOk = sal_False;
+ bool bOk = false;
if( GetType() )
{
ReadNameSvIdl( rBase, rInStm );
aSlotId.ReadSvIdl( rBase, rInStm );
- bOk = sal_True;
+ bOk = true;
SvToken * pTok = rInStm.GetToken();
if( bOk && pTok->IsChar() && pTok->GetChar() == '(' )
{
@@ -379,7 +379,7 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
}
}
-sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const
+sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, bool bVar ) const
{
const SvNumberIdentifier & rId = GetSlotId();
sal_uLong n = rId.GetValue();
@@ -404,14 +404,14 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
if( nT == WRITE_ODL )
{
const SvNumberIdentifier & rId = GetSlotId();
- sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
+ bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
if( (rId.IsSet() && !(nA & WA_STRUCT)) || bReadonly )
{
- sal_Bool bVar = IsVariable();
+ bool bVar = IsVariable();
if( nA & WA_VARIABLE )
- bVar = sal_True;
+ bVar = true;
else if( nA & WA_METHOD )
- bVar = sal_False;
+ bVar = false;
WriteTab( rOutStm, nTab );
rOutStm.WriteCharPtr( "//class SvMetaAttribute" ) << endl;
@@ -432,14 +432,14 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
}
void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
- sal_Bool bSet )
+ bool bSet )
{
rOutStm << endl;
SvMetaType * pType = GetType();
SvMetaType * pBaseType = pType->GetBaseType();
// for Set the return is always void
- sal_Bool bVoid = bSet;
+ bool bVoid = bSet;
if( pBaseType->GetType() == TYPE_METHOD )
bVoid = pBaseType->GetReturnType()->GetBaseType()->GetName().getString() == "void";
@@ -547,11 +547,11 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
else if ( !GetAutomation() || !GetExport() )
return;
- sal_Bool bVariable;
+ bool bVariable;
if( nA & WA_VARIABLE )
- bVariable = sal_True;
+ bVariable = true;
else if( nA & WA_METHOD )
- bVariable = sal_False;
+ bVariable = false;
else
bVariable = IsVariable();
@@ -596,7 +596,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( nT == WRITE_C_HEADER )
rOutStm.WriteChar( ';' ) << endl << endl;
else
- WriteCSource( rBase, rOutStm, sal_False );
+ WriteCSource( rBase, rOutStm, false );
}
else if ( bVariable && IsVariable() )
{
@@ -611,7 +611,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
OString name = GetName().getString();
- sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
+ bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
if ( !bReadonly && !IsMethod() )
{
// allocation
@@ -626,7 +626,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( nT == WRITE_C_HEADER )
rOutStm.WriteChar( ';' ) << endl << endl;
else
- WriteCSource( rBase, rOutStm, sal_True );
+ WriteCSource( rBase, rOutStm, true );
}
// access
@@ -639,7 +639,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( nT == WRITE_C_HEADER )
rOutStm.WriteChar( ';' ) << endl << endl;
else
- WriteCSource( rBase, rOutStm, sal_False );
+ WriteCSource( rBase, rOutStm, false );
}
}
}
@@ -743,13 +743,13 @@ void SvMetaAttribute::WriteHelpId( SvIdlDataBase &, SvStream &, HelpIdTable& )
SV_IMPL_META_FACTORY1( SvMetaType, SvMetaExtern );
#define CTOR \
- : aCall0( CALL_VALUE, sal_False ) \
- , aCall1( CALL_VALUE, sal_False ) \
- , aSbxDataType( 0, sal_False ) \
+ : aCall0( CALL_VALUE, false ) \
+ , aCall1( CALL_VALUE, false ) \
+ , aSbxDataType( 0, false ) \
, pAttrList( NULL ) \
, nType( TYPE_BASE ) \
- , bIsItem( sal_False ) \
- , bIsShell( sal_False ) \
+ , bIsItem( false ) \
+ , bIsShell( false ) \
, cParserChar( 'h' )
SvMetaType::SvMetaType()
@@ -799,8 +799,8 @@ void SvMetaType::Load( SvPersistStream & rStm )
if( nMask & 0x0040 ) rStm >> aSbxName;
if( nMask & 0x0080 ) rStm >> aOdlName;
if( nMask & 0x0100 ) rStm >> GetAttrList();
- if( nMask & 0x0200 ) bIsItem = sal_True;
- if( nMask & 0x0400 ) bIsShell = sal_True;
+ if( nMask & 0x0200 ) bIsItem = true;
+ if( nMask & 0x0400 ) bIsShell = true;
if( nMask & 0x0800 )
{
sal_uInt16 nT;
@@ -906,7 +906,7 @@ OString SvMetaType::GetBasicPostfix() const
makeStringAndClear();
}
-sal_Bool SvMetaType::GetIn() const
+bool SvMetaType::GetIn() const
{
if( aIn.IsSet() || !GetRef() )
return aIn;
@@ -914,7 +914,7 @@ sal_Bool SvMetaType::GetIn() const
return ((SvMetaType *)GetRef())->GetIn();
}
-sal_Bool SvMetaType::GetOut() const
+bool SvMetaType::GetOut() const
{
if( aOut.IsSet() || !GetRef() )
return aOut;
@@ -1002,7 +1002,7 @@ const OString& SvMetaType::GetCName() const
return ((SvMetaType *)GetRef())->GetCName();
}
-sal_Bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase )
+bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase )
{
aSvName.setString(rName);
aSbxName.setString(rName);
@@ -1026,10 +1026,10 @@ OString SvMetaType::GetCString() const
return out.makeStringAndClear();
}
-sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
- SvTokenStream & rInStm )
+bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
+ SvTokenStream & rInStm )
{
- sal_Bool bOk = sal_False;
+ bool bOk = false;
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
@@ -1037,7 +1037,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
|| pTok->Is( SvHash_shell() ) )
{
if( pTok->Is( SvHash_shell() ) )
- bIsShell = sal_True;
+ bIsShell = true;
SetType( TYPE_CLASS );
bOk = ReadNamesSvIdl( rBase, rInStm );
@@ -1051,7 +1051,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
{
SetType( TYPE_UNION );
if( ReadNameSvIdl( rBase, rInStm ) )
- return sal_True;
+ return true;
}
else if( pTok->Is( SvHash_enum() ) )
{
@@ -1062,7 +1062,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
|| pTok->Is( SvHash_item() ) )
{
if( pTok->Is( SvHash_item() ) )
- bIsItem = sal_True;
+ bIsItem = true;
SvMetaType * pType = rBase.ReadKnownType( rInStm );
if( pType )
@@ -1076,12 +1076,12 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
if( rInStm.Read( ')' ) )
{
SetType( TYPE_METHOD );
- bOk = sal_True;
+ bOk = true;
}
}
else
{
- bOk = sal_True;
+ bOk = true;
}
}
}
@@ -1099,15 +1099,15 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
return bOk;
}
-sal_Bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
- SvTokenStream & rInStm )
+bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
+ SvTokenStream & rInStm )
{
if( ReadHeaderSvIdl( rBase, rInStm ) )
{
rBase.Write(OString('.'));
return SvMetaExtern::ReadSvIdl( rBase, rInStm );
}
- return sal_False;
+ return false;
}
void SvMetaType::WriteSvIdl
@@ -1229,10 +1229,10 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-sal_Bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
- SvTokenStream & rInStm )
+bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
+ SvTokenStream & rInStm )
{
- sal_Bool bOk = ReadNameSvIdl( rBase, rInStm );
+ bool bOk = ReadNameSvIdl( rBase, rInStm );
return bOk;
}
@@ -1467,8 +1467,8 @@ void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
}
}
-sal_Bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
- SvTokenStream & rInStm )
+bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
+ SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
if( rInStm.Read( '(' ) )
@@ -1477,11 +1477,11 @@ sal_Bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
if( rInStm.Read( ')' ) )
{
SetType( TYPE_METHOD );
- return sal_True;
+ return true;
}
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
void SvMetaType::WriteMethodArgs
@@ -1604,8 +1604,8 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
case WRITE_ODL:
{
- sal_Bool bIn = GetIn();
- sal_Bool bOut = GetOut();
+ bool bIn = GetIn();
+ bool bOut = GetOut();
if( bIn || bOut )
{
if( bIn && bOut )
@@ -1808,12 +1808,12 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
if( nMask & 0x01 ) write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue);
}
-sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
+bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
if( !ReadNameSvIdl( rBase, rInStm ) )
- return sal_False;
- return sal_True;
+ return false;
+ return true;
}
void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
@@ -1889,7 +1889,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
sal_uInt32 nTokPos = rInStm.Tell();
SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue();
- sal_Bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
+ bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
if( bOk )
{
if( aEnumValueList.empty() )
@@ -1922,7 +1922,7 @@ void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
}
}
-sal_Bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
+bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
@@ -1930,10 +1930,10 @@ sal_Bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
&& GetType() == TYPE_ENUM )
{
if( SvMetaName::ReadSvIdl( rBase, rInStm ) )
- return sal_True;
+ return true;
}
rInStm.Seek( nTokPos );
- return sal_False;
+ return false;
}
void SvMetaTypeEnum::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 13d0c919ac52..b0178ccb798d 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -130,7 +130,7 @@ void DeInit()
delete IDLAPP;
}
-sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
+bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
{
for( size_t n = 0; n < rCommand.aInFileList.size(); ++n )
{
@@ -154,14 +154,14 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
aStr.append(OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8));
fprintf( stderr, "%s\n", aStr.getStr() );
- return sal_False;
+ return false;
}
}
else
{
SvTokenStream aTokStm( aStm, aFileName );
- if( !pDataBase->ReadSvIdl( aTokStm, sal_False, rCommand.aPath ) )
- return sal_False;
+ if( !pDataBase->ReadSvIdl( aTokStm, false, rCommand.aPath ) )
+ return false;
}
}
else
@@ -169,13 +169,13 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
const OString aStr(OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8));
fprintf( stderr, "unable to read input file: %s\n", aStr.getStr() );
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
-static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
+static bool ResponseFile( StringList * pList, int argc, char ** argv )
{
// program name
pList->push_back( OUString::createFromAscii(*argv) );
@@ -185,7 +185,7 @@ static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
{ // when @, then response file
SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
if( aStm.GetError() != SVSTREAM_OK )
- return sal_False;
+ return false;
OString aStr;
while( aStm.ReadLine( aStr ) )
@@ -207,7 +207,7 @@ static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
else if( argv[ i ] )
pList->push_back( OUString::createFromAscii( argv[ i ] ) );
}
- return sal_True;
+ return true;
}
SvCommand::SvCommand( int argc, char ** argv )
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 04f351c6c80d..3a775f614c84 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -28,7 +28,7 @@
#include <osl/file.hxx>
SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
- : bExport( sal_False )
+ : bExport( false )
, nUniqueId( 0 )
, nVerbosity( rCmd.nVerbosity )
, aPersStream( *IDLAPP->pClassMgr, NULL )
@@ -84,7 +84,7 @@ SvMetaModule * SvIdlDataBase::GetModule( const OString& rName )
#define DATABASE_SIGNATURE (sal_uInt32)0x13B799F2
#define DATABASE_VER 0x0006
-sal_Bool SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
+bool SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
{
sal_uInt32 nSig = 0;
sal_uLong nPos = rStm.Tell();
@@ -132,9 +132,9 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
aPStm.WriteUInt32( (sal_uInt32)DATABASE_SIGNATURE );
aPStm.WriteUInt16( (sal_uInt16)DATABASE_VER );
- sal_Bool bOnlyStreamedObjs = sal_False;
+ bool bOnlyStreamedObjs = false;
if( nFlags & IDL_WRITE_CALLING )
- bOnlyStreamedObjs = sal_True;
+ bOnlyStreamedObjs = true;
if( bOnlyStreamedObjs )
{
@@ -174,7 +174,7 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
GetStack().Push( pObj );
}
-sal_Bool SvIdlDataBase::FindId( const OString& rIdName, sal_uLong * pVal )
+bool SvIdlDataBase::FindId( const OString& rIdName, sal_uLong * pVal )
{
if( pIdTable )
{
@@ -182,13 +182,13 @@ sal_Bool SvIdlDataBase::FindId( const OString& rIdName, sal_uLong * pVal )
if( pIdTable->Test( rIdName, &nHash ) )
{
*pVal = pIdTable->Get( nHash )->GetValue();
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
-sal_Bool SvIdlDataBase::InsertId( const OString& rIdName, sal_uLong nVal )
+bool SvIdlDataBase::InsertId( const OString& rIdName, sal_uLong nVal )
{
if( !pIdTable )
pIdTable = new SvStringHashTable( 20003 );
@@ -197,12 +197,12 @@ sal_Bool SvIdlDataBase::InsertId( const OString& rIdName, sal_uLong nVal )
if( pIdTable->Insert( rIdName, &nHash ) )
{
pIdTable->Get( nHash )->SetValue( nVal );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
+bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
{
OUString aFullName;
osl::File::searchFileURL( rFileName, GetPath(), aFullName);
@@ -210,7 +210,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
for ( size_t i = 0, n = aIdFileList.size(); i < n; ++i )
if ( aIdFileList[ i ] == rFileName )
- return sal_True;
+ return true;
aIdFileList.push_back( rFileName );
this->AddDepFile( aFullName );
@@ -236,11 +236,11 @@ sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
// set error
SetError( aStr, pTok );
WriteError( aTokStm );
- return sal_False;
+ return false;
}
sal_uLong nVal = 0;
- sal_Bool bOk = sal_True;
+ bool bOk = true;
while( bOk )
{
pTok = aTokStm.GetToken_Next();
@@ -250,7 +250,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
if( FindId( pTok->GetString(), &n ) )
nVal += n;
else
- bOk = sal_False;
+ bOk = false;
}
else if( pTok->IsChar() )
{
@@ -268,7 +268,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
// set error
SetError( aStr.makeStringAndClear(), pTok );
WriteError( aTokStm );
- return sal_False;
+ return false;
}
if( pTok->GetChar() != '+'
&& pTok->GetChar() != '('
@@ -291,7 +291,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
OString aStr("hash table overflow: ");
SetError( aStr, pTok );
WriteError( aTokStm );
- return sal_False;
+ return false;
}
}
}
@@ -316,7 +316,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
// set error
SetError(aStr, pTok);
WriteError( aTokStm );
- return sal_False;
+ return false;
}
}
if (!ReadIdFile(OStringToOUString(aName.toString(),
@@ -326,7 +326,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
aStr.append(aName.makeStringAndClear());
SetError(aStr.makeStringAndClear(), pTok);
WriteError( aTokStm );
- return sal_False;
+ return false;
}
}
}
@@ -335,8 +335,8 @@ sal_Bool SvIdlDataBase::ReadIdFile( const OUString & rFileName )
}
}
else
- return sal_False;
- return sal_True;
+ return false;
+ return true;
}
SvMetaType * SvIdlDataBase::FindType( const SvMetaType * pPType,
@@ -358,11 +358,11 @@ SvMetaType * SvIdlDataBase::FindType( const OString& rName )
SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
{
- sal_Bool bIn = sal_False;
- sal_Bool bOut = sal_False;
+ bool bIn = false;
+ bool bOut = false;
int nCall0 = CALL_VALUE;
int nCall1 = CALL_VALUE;
- sal_Bool bSet = sal_False; // any attribute set
+ bool bSet = false; // any attribute set
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
@@ -375,22 +375,22 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
nBeginPos = rInStm.Tell();
if( pTok->Is( SvHash_in() ) )
{
- bIn = sal_True;
+ bIn = true;
pTok = rInStm.GetToken_Next();
- bSet = sal_True;
+ bSet = true;
}
if( pTok->Is( SvHash_out() ) )
{
- bOut = sal_True;
+ bOut = true;
pTok = rInStm.GetToken_Next();
- bSet = sal_True;
+ bSet = true;
}
if( pTok->Is( SvHash_inout() ) )
{
- bIn = sal_True;
- bOut = sal_True;
+ bIn = true;
+ bOut = true;
pTok = rInStm.GetToken_Next();
- bSet = sal_True;
+ bSet = true;
}
}
}
@@ -427,7 +427,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
CALL_POINTER;
rInStm.GetToken_Next();
}
- bSet = sal_True;
+ bSet = true;
}
}
@@ -616,10 +616,10 @@ SvIdlWorkingBase::SvIdlWorkingBase(const SvCommand& rCmd) : SvIdlDataBase(rCmd)
{
}
-sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported, const OUString & rPath )
+bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, bool bImported, const OUString & rPath )
{
aPath = rPath; // only valid for this iteration
- sal_Bool bOk = sal_True;
+ bool bOk = true;
SvToken * pTok = rInStm.GetToken();
// only one import at the very beginning
if( pTok->Is( SvHash_import() ) )
@@ -647,22 +647,22 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
aStr.append(OUStringToOString( aFullName, RTL_TEXTENCODING_UTF8));
SetError(aStr.makeStringAndClear(), pTok);
WriteError( rInStm );
- bOk = sal_False;
+ bOk = false;
}
else
{
aStm.Seek( 0 );
aStm.ResetError();
SvTokenStream aTokStm( aStm, aFullName );
- bOk = ReadSvIdl( aTokStm, sal_True, rPath );
+ bOk = ReadSvIdl( aTokStm, true, rPath );
}
}
}
else
- bOk = sal_False;
+ bOk = false;
}
else
- bOk = sal_False;
+ bOk = false;
}
sal_uInt32 nBeginPos = 0xFFFFFFFF; // can not happen with Tell
@@ -672,9 +672,9 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
nBeginPos = rInStm.Tell();
pTok = rInStm.GetToken();
if( pTok->IsEof() )
- return sal_True;
+ return true;
if( pTok->IsEmpty() )
- bOk = sal_False;
+ bOk = false;
// only one import at the very beginning
if( pTok->Is( SvHash_module() ) )
@@ -683,24 +683,24 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
if( aModule->ReadSvIdl( *this, rInStm ) )
GetModuleList().push_back( aModule );
else
- bOk = sal_False;
+ bOk = false;
}
else
- bOk = sal_False;
+ bOk = false;
}
if( !bOk || !pTok->IsEof() )
{
// error treatment
WriteError( rInStm );
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
+bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
{
if( rOutStm.GetError() != SVSTREAM_OK )
- return sal_False;
+ return false;
SvStringHashList aList;
if( GetIdTable() )
@@ -721,13 +721,13 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
SvMetaModule * pModule = GetModuleList()[n];
pModule->WriteSvIdl( *this, rOutStm, 0 );
}
- return sal_True;
+ return true;
}
-sal_Bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
+bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
{
if( rOutStm.GetError() != SVSTREAM_OK )
- return sal_False;
+ return false;
// reset all tmp variables for writing
WriteReset();
@@ -747,13 +747,13 @@ sal_Bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
}
aUsedTypes.clear();
rOutStm.WriteStream( aTmpStm );
- return sal_True;
+ return true;
}
-sal_Bool SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
+bool SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
{
if( rOutStm.GetError() != SVSTREAM_OK )
- return sal_False;
+ return false;
HelpIdTable aIdTable;
sal_uLong n;
@@ -770,12 +770,12 @@ sal_Bool SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
pAttr->WriteHelpId( *this, rOutStm, aIdTable );
}
- return sal_True;
+ return true;
}
-sal_Bool SvIdlWorkingBase::WriteSfxItem( SvStream & )
+bool SvIdlWorkingBase::WriteSfxItem( SvStream & )
{
- return sal_False;
+ return false;
}
void SvIdlDataBase::StartNewFile( const OUString& rName )
@@ -787,10 +787,10 @@ void SvIdlDataBase::AppendAttr( SvMetaAttribute *pAttr )
{
aAttrList.push_back( pAttr );
if ( bExport )
- pAttr->SetNewAttribute( sal_True );
+ pAttr->SetNewAttribute( true );
}
-sal_Bool SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
+bool SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
{
SvMetaAttributeMemberList &rList = GetAttrList();
sal_uLong nCount = rList.size();
@@ -803,15 +803,15 @@ sal_Bool SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
}
if ( rStrm.GetError() != SVSTREAM_OK )
- return sal_False;
+ return false;
else
- return sal_True;
+ return true;
}
-sal_Bool SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
+bool SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
{
if( rOutStm.GetError() != SVSTREAM_OK )
- return sal_False;
+ return false;
for( sal_uLong n = 0; n < GetModuleList().size(); n++ )
{
@@ -819,7 +819,7 @@ sal_Bool SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
if( !pModule->IsImported() )
pModule->Write( *this, rOutStm, 0, WRITE_DOCU );
}
- return sal_True;
+ return true;
}
void SvIdlDataBase::AddDepFile(OUString const& rFileName)
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 7eebf9b32740..94a6e538f7d7 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -27,7 +27,7 @@
#include <osl/file.hxx>
#define BR 0x8000
-sal_Bool FileMove_Impl( const OUString & rFile1, const OUString & rFile2, sal_Bool bImmerVerschieben )
+bool FileMove_Impl( const OUString & rFile1, const OUString & rFile2, bool bImmerVerschieben )
{
//printf( "Move from %s to %s\n", rFile2.GetStr(), rFile1.GetStr() );
sal_uLong nC1 = 0;
@@ -73,9 +73,9 @@ sal_Bool FileMove_Impl( const OUString & rFile1, const OUString & rFile2, sal_Bo
// delete both files
osl::File::remove( fileURL1 );
osl::File::remove( fileURL2 );
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
return osl::FileBase::E_None == osl::File::remove( fileURL2 );
}
@@ -239,7 +239,7 @@ int main ( int argc, char ** argv)
if( nExit == 0 )
{
bool bErr = false;
- sal_Bool bDoMove = aCommand.aTargetFile.isEmpty();
+ bool bDoMove = aCommand.aTargetFile.isEmpty();
OUString aErrFile, aErrFile2;
if( !bErr && !aCommand.aListFile.isEmpty() )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 11:46:10 +0000