summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'idl/inc')
-rwxr-xr-x[-rw-r--r--]idl/inc/basobj.hxx50
-rwxr-xr-x[-rw-r--r--]idl/inc/bastype.hxx126
-rwxr-xr-x[-rw-r--r--]idl/inc/command.hxx6
-rwxr-xr-x[-rw-r--r--]idl/inc/database.hxx38
-rwxr-xr-x[-rw-r--r--]idl/inc/hash.hxx60
-rwxr-xr-x[-rw-r--r--]idl/inc/lex.hxx84
-rwxr-xr-x[-rw-r--r--]idl/inc/module.hxx32
-rwxr-xr-x[-rw-r--r--]idl/inc/object.hxx38
-rwxr-xr-x[-rw-r--r--]idl/inc/slot.hxx138
-rwxr-xr-x[-rw-r--r--]idl/inc/types.hxx140
10 files changed, 356 insertions, 356 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index f6705dae8be6..32a05d2a4c6b 100644..100755
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -104,19 +104,19 @@ public:
SvMetaObject();
#ifdef IDL_COMPILER
- static void WriteTab( SvStream & rOutStm, USHORT nTab );
- static BOOL TestAndSeekSpaceOnly( SvStream &, ULONG nBegPos );
+ static void WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
+ static sal_Bool TestAndSeekSpaceOnly( SvStream &, sal_uLong nBegPos );
static void Back2Delemitter( SvStream & );
static void WriteStars( SvStream & );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
#endif
};
SV_DECL_IMPL_REF(SvMetaObject)
@@ -136,7 +136,7 @@ public:
SvMetaObject * Pop() { return aList.Remove( aList.Count() -1 ); }
SvMetaObject * Top() const { return aList.GetObject( aList.Count() -1 ); }
void Clear() { aList.Clear(); }
- ULONG Count() const { return aList.Count(); }
+ sal_uLong Count() const { return aList.Count(); }
SvMetaObject * Get( TypeId nType )
{
@@ -162,26 +162,26 @@ class SvMetaName : public SvMetaObject
protected:
#ifdef IDL_COMPILER
- virtual BOOL ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
char c = '\0' );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
- virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
- virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
#endif
public:
SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
SvMetaName();
- virtual BOOL SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
void SetDescription( const ByteString& rText )
{ aDescription = rText; }
const SvHelpContext& GetHelpContext() const { return aHelpContext; }
@@ -191,10 +191,10 @@ public:
virtual const SvString& GetDescription() const{ return aDescription; }
#ifdef IDL_COMPILER
- virtual BOOL Test( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_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,
WriteType, WriteAttribute = 0);
void WriteDescription( SvStream& rOutStm );
#endif
@@ -260,8 +260,8 @@ class SvMetaExtern : public SvMetaReference
SvUUId aUUId;
SvVersion aVersion;
- BOOL bReadUUId;
- BOOL bReadVersion;
+ sal_Bool bReadUUId;
+ sal_Bool bReadVersion;
public:
SV_DECL_META_FACTORY1( SvMetaExtern, SvMetaName, 16 )
SvMetaExtern();
@@ -272,16 +272,16 @@ public:
const SvVersion & GetVersion() const { return aVersion; }
#ifdef IDL_COMPILER
void SetModule( SvIdlDataBase & rBase );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
- virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
#endif
};
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 99d14ac93432..0fe59e2c86eb 100644..100755
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -42,16 +42,16 @@ class SvTokenStream;
/******************** class SvUINT32 **********************************/
class SvUINT32
{
- UINT32 nVal;
+ sal_uInt32 nVal;
public:
SvUINT32() { nVal = 0; }
- SvUINT32( UINT32 n ) : nVal( n ) {}
- SvUINT32 & operator = ( UINT32 n ) { nVal = n; return *this; }
+ SvUINT32( sal_uInt32 n ) : nVal( n ) {}
+ SvUINT32 & operator = ( sal_uInt32 n ) { nVal = n; return *this; }
- operator UINT32 &() { return nVal; }
+ operator sal_uInt32 &() { return nVal; }
- static UINT32 Read( SvStream & rStm );
- static void Write( SvStream & rStm, UINT32 nVal );
+ static sal_uInt32 Read( SvStream & rStm );
+ static void Write( SvStream & rStm, sal_uInt32 nVal );
friend SvStream& operator << (SvStream & rStm, const SvUINT32 & r )
{ SvUINT32::Write( rStm, r.nVal ); return rStm; }
@@ -72,7 +72,7 @@ public:
operator short &() { return nVal; }
friend SvStream& operator << (SvStream & rStm, const SvINT16 & r )
- { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, SvINT16 & r )
{ r.nVal = (short)SvUINT32::Read( rStm ); return rStm; }
};
@@ -81,36 +81,36 @@ public:
/******************** class SvUINT16 **********************************/
class SvUINT16
{
- USHORT nVal;
+ sal_uInt16 nVal;
public:
SvUINT16() { nVal = 0; }
- SvUINT16( USHORT n ) : nVal( n ) {}
- SvUINT16 & operator = ( USHORT n ) { nVal = n; return *this; }
+ SvUINT16( sal_uInt16 n ) : nVal( n ) {}
+ SvUINT16 & operator = ( sal_uInt16 n ) { nVal = n; return *this; }
- operator UINT16 &() { return nVal; }
+ operator sal_uInt16 &() { return nVal; }
friend SvStream& operator << (SvStream & rStm, const SvUINT16 & r )
- { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, SvUINT16 & r )
- { r.nVal = (USHORT)SvUINT32::Read( rStm ); return rStm; }
+ { r.nVal = (sal_uInt16)SvUINT32::Read( rStm ); return rStm; }
};
/******************** class SvINT32 **********************************/
class SvINT32
{
- INT32 nVal;
+ sal_Int32 nVal;
public:
SvINT32() { nVal = 0; }
- SvINT32( INT32 n ) : nVal( n ) {}
- SvINT32 & operator = ( INT32 n ) { nVal = n; return *this; }
+ SvINT32( sal_Int32 n ) : nVal( n ) {}
+ SvINT32 & operator = ( sal_Int32 n ) { nVal = n; return *this; }
- operator INT32 &() { return nVal; }
+ operator sal_Int32 &() { return nVal; }
friend SvStream& operator << (SvStream & rStm, const SvINT32 & r )
- { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, SvINT32 & r )
- { r.nVal = (INT32)SvUINT32::Read( rStm ); return rStm; }
+ { r.nVal = (sal_Int32)SvUINT32::Read( rStm ); return rStm; }
};
@@ -118,18 +118,18 @@ public:
class Svint
{
int nVal;
- BOOL bSet;
+ sal_Bool bSet;
public:
Svint() { nVal = bSet = 0; }
- 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; }
+ 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; }
operator int ()const { return nVal; }
- BOOL IsSet() const { return bSet; }
+ sal_Bool IsSet() const { return bSet; }
friend SvStream& operator << (SvStream & rStm, const Svint & r )
- { SvUINT32::Write( rStm, (UINT32)r.nVal ); rStm << r.bSet; return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm << r.bSet; return rStm; }
friend SvStream& operator >> (SvStream & rStm, Svint & r )
{ r.nVal = (int)SvUINT32::Read( rStm ); rStm >> r.bSet ; return rStm; }
};
@@ -138,27 +138,27 @@ public:
/******************** class SvBOOL **********************************/
class SvBOOL
{
- BOOL nVal:1,
+ sal_Bool nVal:1,
bSet:1;
public:
- 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; }
+ 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; }
- operator BOOL() const { return nVal; }
+ operator sal_Bool() const { return nVal; }
#ifdef STC
operator int() const { return nVal; }
#endif
- BOOL Is() const { return nVal; }
- BOOL IsSet() const { return bSet; }
+ sal_Bool Is() const { return nVal; }
+ sal_Bool IsSet() const { return bSet; }
friend SvStream& operator << (SvStream &, const SvBOOL &);
friend SvStream& operator >> (SvStream &, SvBOOL &);
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
+ sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
ByteString GetSvIdlString( SvStringHashEntry * pName );
#endif
};
@@ -174,11 +174,11 @@ public:
friend SvStream& operator << (SvStream &, const SvIdentifier &);
friend SvStream& operator >> (SvStream &, SvIdentifier &);
- BOOL IsSet() const { return Len() != 0; }
+ sal_Bool IsSet() const { return Len() != 0; }
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
- USHORT nTab );
+ sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+ sal_uInt16 nTab );
#endif
};
@@ -186,23 +186,23 @@ public:
/******************** class SvIdentifier **********************************/
class SvNumberIdentifier : public SvIdentifier
{
- UINT32 nValue;
+ sal_uInt32 nValue;
// darf nicht benutzt werden
- BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
public:
SvNumberIdentifier() : nValue( 0 ) {};
- BOOL IsSet() const
+ sal_Bool IsSet() const
{
return SvIdentifier::IsSet() || nValue != 0;
}
- UINT32 GetValue() const { return nValue; }
- void SetValue( UINT32 nVal ) { nValue = nVal; }
+ sal_uInt32 GetValue() const { return nValue; }
+ void SetValue( sal_uInt32 nVal ) { nValue = nVal; }
friend SvStream& operator << (SvStream &, const SvNumberIdentifier &);
friend SvStream& operator >> (SvStream &, SvNumberIdentifier &);
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- BOOL ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
+ sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
SvTokenStream & rInStm );
#endif
};
@@ -215,14 +215,14 @@ public:
SvString(){};
SvString & operator = ( const ByteString & rStr )
{ ByteString::operator =( rStr ); return *this; }
- BOOL IsSet() const { return Len() != 0; }
+ sal_Bool IsSet() const { return Len() != 0; }
friend SvStream& operator << (SvStream &, const SvString &);
friend SvStream& operator >> (SvStream &, SvString &);
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
- USHORT nTab );
+ sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+ sal_uInt16 nTab );
#endif
};
@@ -233,9 +233,9 @@ class SvHelpText : public SvString
public:
SvHelpText() {}
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab );
+ sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
+ sal_uInt16 nTab );
#endif
};
@@ -251,8 +251,8 @@ class SvUUId : public SvGlobalName
public:
SvUUId() {}
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStream & rOutStm );
+ sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStream & rOutStm );
#endif
};
@@ -260,28 +260,28 @@ public:
/******************** class SvVersion **********************************/
class SvVersion
{
- USHORT nMajorVersion;
- USHORT nMinorVersion;
+ sal_uInt16 nMajorVersion;
+ sal_uInt16 nMinorVersion;
public:
SvVersion() : nMajorVersion( 1 ), nMinorVersion( 0 ) {}
- BOOL operator == ( const SvVersion & r )
+ sal_Bool operator == ( const SvVersion & r )
{
return (r.nMajorVersion == nMajorVersion)
&& (r.nMinorVersion == nMinorVersion);
}
- BOOL operator != ( const SvVersion & r )
+ sal_Bool operator != ( const SvVersion & r )
{
return !(*this == r);
}
- USHORT GetMajorVersion() const { return nMajorVersion; }
- USHORT GetMinorVersion() const { return nMinorVersion; }
+ sal_uInt16 GetMajorVersion() const { return nMajorVersion; }
+ sal_uInt16 GetMinorVersion() const { return nMinorVersion; }
friend SvStream& operator << (SvStream &, const SvVersion &);
friend SvStream& operator >> (SvStream &, SvVersion &);
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStream & rOutStm );
+ sal_Bool ReadSvIdl( SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStream & rOutStm );
#endif
};
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 53512f4854d8..5a9577178193 100644..100755
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -62,8 +62,8 @@ public:
String aCSVFile;
String aExportFile;
String aDocuFile;
- UINT32 nVerbosity;
- UINT32 nFlags;
+ sal_uInt32 nVerbosity;
+ sal_uInt32 nFlags;
SvCommand( int argc, char ** argv );
~SvCommand();
@@ -71,7 +71,7 @@ public:
void Init();
class SvIdlWorkingBase;
-BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
+sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
void DeInit();
#endif // _COMMAND_HXX
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 0f207b64aef8..b3f9ca5b154f 100644..100755
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -44,15 +44,15 @@ class SvIdlError
{
ByteString aText;
public:
- UINT32 nLine, nColumn;
+ sal_uInt32 nLine, nColumn;
SvIdlError() : nLine(0), nColumn(0) {}
- SvIdlError( UINT32 nL, UINT32 nC )
+ SvIdlError( sal_uInt32 nL, sal_uInt32 nC )
: nLine(nL), nColumn(nC) {}
const ByteString & GetText() const { return aText; }
void SetText( const ByteString & rT ) { aText = rT; }
- BOOL IsError() const { return nLine != 0; }
+ sal_Bool IsError() const { return nLine != 0; }
void Clear() { nLine = nColumn = 0; }
SvIdlError & operator = ( const SvIdlError & rRef )
{ aText = rRef.aText;
@@ -66,13 +66,13 @@ public:
/******************** class SvIdlDataBase ********************************/
class SvIdlDataBase
{
- BOOL bExport;
+ sal_Bool bExport;
String aExportFile;
sal_uInt32 nUniqueId;
sal_uInt32 nVerbosity;
String aDataBaseFile;
SvFileStream * pStm;
- BOOL bIsModified;
+ sal_Bool bIsModified;
SvPersistStream aPersStream;
StringList aIdFileList;
SvStringHashTable * pIdTable;
@@ -98,10 +98,10 @@ protected:
public:
explicit SvIdlDataBase( const SvCommand& rCmd );
~SvIdlDataBase();
- static BOOL IsBinaryFormat( SvStream & rInStm );
+ static sal_Bool IsBinaryFormat( SvStream & rInStm );
void Load( SvStream & rInStm );
- void Save( SvStream & rInStm, UINT32 nContextFlags );
+ void Save( SvStream & rInStm, sal_uInt32 nContextFlags );
SvMetaAttributeMemberList& GetAttrList() { return aAttrList; }
SvStringHashTable * GetIdTable() { return pIdTable; }
@@ -132,11 +132,11 @@ public:
void WriteError( const ByteString & rErrWrn,
const ByteString & rFileName,
const ByteString & rErrorText,
- ULONG nRow = 0, ULONG nColumn = 0 ) const;
+ sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
void WriteError( SvTokenStream & rInStm );
void SetError( const ByteString & rError, SvToken * pTok );
void Push( SvMetaObject * pObj );
- BOOL Pop( BOOL bOk, SvTokenStream & rInStm, UINT32 nTokPos )
+ sal_Bool Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
{
GetStack().Pop();
if( bOk )
@@ -146,9 +146,9 @@ public:
return bOk;
}
sal_uInt32 GetUniqueId() { return ++nUniqueId; }
- BOOL FindId( const ByteString & rIdName, ULONG * pVal );
- BOOL InsertId( const ByteString & rIdName, ULONG nVal );
- BOOL ReadIdFile( const String & rFileName );
+ sal_Bool FindId( const ByteString & rIdName, sal_uLong * pVal );
+ sal_Bool InsertId( const ByteString & rIdName, sal_uLong nVal );
+ sal_Bool ReadIdFile( const String & rFileName );
SvMetaType * FindType( const ByteString & rName );
static SvMetaType * FindType( const SvMetaType *, SvMetaTypeMemberList & );
@@ -167,14 +167,14 @@ class SvIdlWorkingBase : public SvIdlDataBase
public:
explicit SvIdlWorkingBase( const SvCommand& rCmd );
- BOOL ReadSvIdl( SvTokenStream &, BOOL bImported, const String & rPath );
- BOOL WriteSvIdl( SvStream & );
+ sal_Bool ReadSvIdl( SvTokenStream &, sal_Bool bImported, const String & rPath );
+ sal_Bool WriteSvIdl( SvStream & );
- BOOL WriteSfx( SvStream & );
- BOOL WriteHelpIds( SvStream & );
- BOOL WriteSfxItem( SvStream & );
- BOOL WriteCSV( SvStream& );
- BOOL WriteDocumentation( SvStream& );
+ sal_Bool WriteSfx( SvStream & );
+ sal_Bool WriteHelpIds( SvStream & );
+ sal_Bool WriteSfxItem( SvStream & );
+ sal_Bool WriteCSV( SvStream& );
+ sal_Bool WriteDocumentation( SvStream& );
};
#endif
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 2749181d5966..ec97a12a8fce 100644..100755
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -36,24 +36,24 @@
/****************** H a s h - T a b l e **********************************/
class SvHashTable
{
- UINT32 nMax; // size of hash-tabel
- UINT32 nFill; // elements in hash-tabel
- UINT32 lAsk; // Anzahl der Anfragen
- UINT32 lTry; // Anzahl der Versuche
+ sal_uInt32 nMax; // size of hash-tabel
+ sal_uInt32 nFill; // elements in hash-tabel
+ sal_uInt32 lAsk; // Anzahl der Anfragen
+ sal_uInt32 lTry; // Anzahl der Versuche
protected:
- BOOL Test_Insert( const void *, BOOL bInsert, UINT32 * pInsertPos );
+ sal_Bool Test_Insert( const void *, sal_Bool bInsert, sal_uInt32 * pInsertPos );
// compare element with entry
- virtual StringCompare Compare( const void * , UINT32 ) const = 0;
+ virtual StringCompare Compare( const void * , sal_uInt32 ) const = 0;
// get hash value from subclass
- virtual UINT32 HashFunc( const void * ) const = 0;
+ virtual sal_uInt32 HashFunc( const void * ) const = 0;
public:
- SvHashTable( UINT32 nMaxEntries );
+ SvHashTable( sal_uInt32 nMaxEntries );
virtual ~SvHashTable();
- UINT32 GetMax() const { return nMax; }
+ sal_uInt32 GetMax() const { return nMax; }
- virtual BOOL IsEntry( UINT32 ) const = 0;
+ virtual sal_Bool IsEntry( sal_uInt32 ) const = 0;
};
/************** S t r i n g H a s h T a b l e E n t r y ******************/
@@ -62,28 +62,28 @@ class SvStringHashEntry : public SvRefBase
{
friend class SvStringHashTable;
ByteString aName;
- UINT32 nHashId;
- ULONG nValue;
- BOOL bHasId;
+ sal_uInt32 nHashId;
+ sal_uLong nValue;
+ sal_Bool bHasId;
public:
- SvStringHashEntry() : bHasId( FALSE ) {;}
- SvStringHashEntry( const ByteString & rName, UINT32 nIdx )
+ SvStringHashEntry() : bHasId( sal_False ) {;}
+ SvStringHashEntry( const ByteString & rName, sal_uInt32 nIdx )
: aName( rName )
, nHashId( nIdx )
, nValue( 0 )
- , bHasId( TRUE ) {}
+ , bHasId( sal_True ) {}
~SvStringHashEntry();
const ByteString & GetName() const { return aName; }
- BOOL HasId() const { return bHasId; }
- UINT32 GetId() const { return nHashId; }
+ sal_Bool HasId() const { return bHasId; }
+ sal_uInt32 GetId() const { return nHashId; }
- void SetValue( ULONG n ) { nValue = n; }
- ULONG GetValue() const { return nValue; }
+ void SetValue( sal_uLong n ) { nValue = n; }
+ sal_uLong GetValue() const { return nValue; }
- BOOL operator == ( const SvStringHashEntry & rRef )
+ sal_Bool operator == ( const SvStringHashEntry & rRef )
{ return nHashId == rRef.nHashId; }
- BOOL operator != ( const SvStringHashEntry & rRef )
+ sal_Bool operator != ( const SvStringHashEntry & rRef )
{ return ! operator == ( rRef ); }
SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
{ SvRefBase::operator=( rRef );
@@ -104,19 +104,19 @@ class SvStringHashTable : public SvHashTable
{
SvStringHashEntry * pEntries;
protected:
- virtual UINT32 HashFunc( const void * pElement ) const;
- virtual StringCompare Compare( const void * pElement, UINT32 nIndex ) const;
+ virtual sal_uInt32 HashFunc( const void * pElement ) const;
+ virtual StringCompare Compare( const void * pElement, sal_uInt32 nIndex ) const;
public:
- SvStringHashTable( UINT32 nMaxEntries ); // max size of hash-tabel
+ SvStringHashTable( sal_uInt32 nMaxEntries ); // max size of hash-tabel
virtual ~SvStringHashTable();
ByteString GetNearString( const ByteString & rName ) const;
- virtual BOOL IsEntry( UINT32 nIndex ) const;
+ virtual sal_Bool IsEntry( sal_uInt32 nIndex ) const;
- BOOL Insert( const ByteString & rStr, UINT32 * pHash ); // insert string
- BOOL Test( const ByteString & rStr, UINT32 * pHash ) const; // test of insert string
- SvStringHashEntry * Get ( UINT32 nIndex ) const; // return pointer to string
- SvStringHashEntry & operator []( UINT32 nPos ) const
+ sal_Bool Insert( const ByteString & rStr, sal_uInt32 * pHash ); // insert string
+ sal_Bool Test( const ByteString & 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 ]; }
void FillHashList( SvStringHashList * rList ) const;
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index b42a7ce4b0f2..9c7ecdd95f3a 100644..100755
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -44,13 +44,13 @@ class BigInt;
class SvToken
{
friend class SvTokenStream;
- ULONG nLine, nColumn;
+ sal_uLong nLine, nColumn;
SVTOKEN_ENUM nType;
ByteString aString;
union
{
- ULONG nLong;
- BOOL bBool;
+ sal_uLong nLong;
+ sal_Bool bBool;
char cChar;
// SvRttiBase * pComplexObj;
SvStringHashEntry * pHash;
@@ -58,8 +58,8 @@ friend class SvTokenStream;
public:
SvToken();
SvToken( const SvToken & rObj );
- SvToken( ULONG n );
- SvToken( SVTOKEN_ENUM nTypeP, BOOL b );
+ SvToken( sal_uLong n );
+ SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
SvToken( char c );
SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
// SvToken( SvRttiBase * pComplexObj );
@@ -70,27 +70,27 @@ public:
ByteString GetTokenAsString() const;
SVTOKEN_ENUM GetType() const { return nType; }
- void SetLine( ULONG nLineP ) { nLine = nLineP; }
- ULONG GetLine() const { return nLine; }
+ void SetLine( sal_uLong nLineP ) { nLine = nLineP; }
+ sal_uLong GetLine() const { return nLine; }
- void SetColumn( ULONG nColumnP ) { nColumn = nColumnP; }
- ULONG GetColumn() const { return nColumn; }
+ void SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP; }
+ 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
+ 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
{ return nType == SVTOKEN_HASHID; }
- BOOL IsIdentifier() const
+ sal_Bool IsIdentifier() const
{
return nType == SVTOKEN_IDENTIFIER
|| nType == SVTOKEN_HASHID;
}
- BOOL IsChar() const { return nType == SVTOKEN_CHAR; }
- BOOL IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
- BOOL IsEof() const { return nType == SVTOKEN_EOF; }
+ sal_Bool IsChar() const { return nType == SVTOKEN_CHAR; }
+ sal_Bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
+ sal_Bool IsEof() const { return nType == SVTOKEN_EOF; }
const ByteString & GetString() const
{
@@ -98,27 +98,27 @@ public:
? pHash->GetName()
: aString;
}
- ULONG GetNumber() const { return nLong; }
- BOOL GetBool() const { return bBool; }
+ sal_uLong GetNumber() const { return nLong; }
+ sal_Bool GetBool() const { return bBool; }
char GetChar() const { return cChar; }
// SvRttiBase *GetObject() const { return pComplexObj; }
void SetHash( SvStringHashEntry * pHashP )
{ pHash = pHashP; nType = SVTOKEN_HASHID; }
- BOOL HasHash() const
+ sal_Bool HasHash() const
{ return nType == SVTOKEN_HASHID; }
SvStringHashEntry * GetHash() const { return pHash; }
- BOOL Is( SvStringHashEntry * pEntry ) const
+ sal_Bool Is( SvStringHashEntry * pEntry ) const
{ return IsIdentifierHash() && pHash == pEntry; }
};
inline SvToken::SvToken()
: nType( SVTOKEN_EMPTY ) {}
-inline SvToken::SvToken( ULONG n )
+inline SvToken::SvToken( sal_uLong n )
: nType( SVTOKEN_INTEGER ), nLong( n ) {}
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, BOOL b )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
: nType( nTypeP ), bBool( b ) {}
inline SvToken::SvToken( char c )
@@ -141,15 +141,15 @@ DECLARE_LIST( SvTokenList, SvToken * )
/******************** class SvTokenStream ********************************/
class SvTokenStream
{
- ULONG nLine, nColumn;
+ sal_uLong nLine, nColumn;
int nBufPos;
int c; // naechstes Zeichen
CharSet nCharSet;
char * pCharTab; // Zeiger auf die Konverierungstabelle
- USHORT nTabSize; // Tabulator Laenge
+ sal_uInt16 nTabSize; // Tabulator Laenge
ByteString aStrTrue;
ByteString aStrFalse;
- ULONG nMaxPos;
+ sal_uLong nMaxPos;
SvFileStream * pInStream;
SvStream & rInStream;
@@ -163,16 +163,16 @@ class SvTokenStream
int GetNextChar();
int GetFastNextChar()
{
- return aBufStr.GetChar((USHORT)nBufPos++);
+ return aBufStr.GetChar((sal_uInt16)nBufPos++);
}
void FillTokenList();
- ULONG GetNumber();
- BOOL MakeToken( SvToken & );
- BOOL IsEof() const { return rInStream.IsEof(); }
+ sal_uLong GetNumber();
+ sal_Bool MakeToken( SvToken & );
+ sal_Bool IsEof() const { return rInStream.IsEof(); }
void SetMax()
{
- ULONG n = Tell();
+ sal_uLong n = Tell();
if( n > nMaxPos )
nMaxPos = n;
}
@@ -181,7 +181,7 @@ class SvTokenStream
// wenn Zeilenende berechnung sparen
if( 0 != c )
{
- USHORT n = 0;
+ sal_uInt16 n = 0;
nColumn = 0;
while( n < nBufPos )
nColumn += aBufStr.GetChar(n++) == '\t' ? nTabSize : 1;
@@ -198,9 +198,9 @@ public:
void SetCharSet( CharSet nSet );
CharSet GetCharSet() const { return nCharSet; }
- void SetTabSize( USHORT nTabSizeP )
+ void SetTabSize( sal_uInt16 nTabSizeP )
{ nTabSize = nTabSizeP; }
- USHORT GetTabSize() const { return nTabSize; }
+ sal_uInt16 GetTabSize() const { return nTabSize; }
SvToken * GetToken_PrevAll()
{
@@ -226,16 +226,16 @@ public:
return GetToken_NextAll();
}
SvToken * GetToken() const { return pCurToken; }
- BOOL Read( char cChar )
+ sal_Bool Read( char cChar )
{
if( pCurToken->IsChar()
&& cChar == pCurToken->GetChar() )
{
GetToken_Next();
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
void ReadDelemiter()
{
@@ -247,14 +247,14 @@ public:
}
}
- UINT32 Tell() const
+ sal_uInt32 Tell() const
{ return aTokList.GetCurPos(); }
- void Seek( UINT32 nPos )
+ void Seek( sal_uInt32 nPos )
{
pCurToken = aTokList.Seek( nPos );
SetMax();
}
- void SeekRel( INT32 nRelPos )
+ void SeekRel( sal_Int32 nRelPos )
{
pCurToken = aTokList.Seek( Tell() + nRelPos );
SetMax();
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index d35ed24affc2..5ffd670d6202 100644..100755
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -34,8 +34,8 @@
struct SvNamePos
{
SvGlobalName aUUId;
- UINT32 nStmPos;
- SvNamePos( const SvGlobalName & rName, UINT32 nPos )
+ sal_uInt32 nStmPos;
+ SvNamePos( const SvGlobalName & rName, sal_uInt32 nPos )
: aUUId( rName )
, nStmPos( nPos ) {}
};
@@ -55,16 +55,16 @@ class SvMetaModule : public SvMetaExtern
SvString aModulePrefix;
#ifdef IDL_COMPILER
- BOOL bImported : 1,
+ sal_Bool bImported : 1,
bIsModified : 1;
SvGlobalName aBeginName;
SvGlobalName aEndName;
SvGlobalName aNextName;
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaModule, SvMetaExtern, 13 )
@@ -73,7 +73,7 @@ public:
const String & GetIdlFileName() const { return aIdlFileName; }
const ByteString & GetModulePrefix() const { return aModulePrefix; }
- virtual BOOL SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
const ByteString & GetHelpFileName() const { return aHelpFileName; }
const ByteString & GetTypeLibFileName() const { return aTypeLibFile; }
@@ -84,20 +84,20 @@ public:
#ifdef IDL_COMPILER
SvMetaModule( const String & rIdlFileName,
- BOOL bImported );
+ sal_Bool bImported );
- BOOL FillNextName( SvGlobalName * );
- BOOL IsImported() const { return bImported; }
- BOOL IsModified() const { return bIsModified; }
+ sal_Bool FillNextName( SvGlobalName * );
+ sal_Bool IsImported() const { return bImported; }
+ sal_Bool IsModified() const { return bIsModified; }
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void WriteAttributes( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
// virtual void WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm, SvNamePosList & rList );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -105,8 +105,8 @@ public:
virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
Table *pIdTable );
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
#endif
};
SV_DECL_IMPL_REF(SvMetaModule)
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 377c5bf0a959..5f4b44c8d7fb 100644..100755
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -49,9 +49,9 @@ DECLARE_LIST( SvMetaClassList, SvMetaClass* )
class SvULongs : public List
{
public:
- void Insert( ULONG& rId, ULONG nPos ) { ULONG nId(rId ); List::Insert( (void*) nId, nPos ); }
- void Remove( ULONG& rId ){ ULONG nId(rId ); List::Remove( (void*) nId ); }
- ULONG GetObject( ULONG nPos ){ return (ULONG) List::GetObject( nPos ); }
+ void Insert( sal_uLong& rId, sal_uLong nPos ) { sal_uLong nId(rId ); List::Insert( (void*) nId, nPos ); }
+ void Remove( sal_uLong& rId ){ sal_uLong nId(rId ); List::Remove( (void*) nId ); }
+ sal_uLong GetObject( sal_uLong nPos ){ return (sal_uLong) List::GetObject( nPos ); }
};
/******************** class SvClassElement *******************************/
@@ -70,9 +70,9 @@ public:
const ByteString & GetPrefix() const
{ return aPrefix; }
- void SetAutomation( BOOL rAutomation )
+ void SetAutomation( sal_Bool rAutomation )
{ aAutomation = rAutomation; }
- BOOL GetAutomation() const
+ sal_Bool GetAutomation() const
{ return aAutomation; }
void SetClass( SvMetaClass * pClass )
@@ -97,18 +97,18 @@ class SvMetaClass : public SvMetaType
// void FillSbxMemberObject( SvIdlDataBase & rBase,
// SbxObject *, StringList &,
-// BOOL bVariable );
- BOOL TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+// sal_Bool bVariable );
+ sal_Bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const;
#ifdef IDL_COMPILER
void WriteSlotStubs( const ByteString & rShellName,
SvSlotElementList & rSlotList,
ByteStringList & rList,
SvStream & rOutStm );
- USHORT WriteSlotParamArray( SvIdlDataBase & rBase,
+ sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvSlotElementList & rSlotList,
SvStream & rOutStm );
- USHORT WriteSlots( const ByteString & rShellName, USHORT nCount,
+ sal_uInt16 WriteSlots( const ByteString & rShellName, sal_uInt16 nCount,
SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm );
@@ -121,21 +121,21 @@ protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
virtual void ReadContextSvIdl( SvIdlDataBase &,
SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
void WriteOdlMembers( ByteStringList & rSuperList,
- BOOL bVariable, BOOL bWriteTab,
+ sal_Bool bVariable, sal_Bool bWriteTab,
SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaClass, SvMetaType, 6 )
SvMetaClass();
- BOOL GetAutomation() const
+ sal_Bool GetAutomation() const
{ return aAutomation; }
SvMetaClass * GetSuperClass() const
{ return aSuperClass; }
@@ -148,18 +148,18 @@ public:
{ return aClassList; }
#ifdef IDL_COMPILER
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
Table* pTable );
virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pTable );
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
#endif
};
SV_IMPL_REF(SvMetaClass)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index e44df5bd5af6..95d4051026be 100644..100755
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -75,108 +75,108 @@ class SvMetaSlot : public SvMetaAttribute
SvString aDisableFlags;
SvMetaSlot* pLinkedSlot;
SvMetaSlot* pNextSlot;
- ULONG nListPos;
+ sal_uLong nListPos;
SvMetaEnumValue* pEnumValue;
SvString aUnoName;
#ifdef IDL_COMPILER
void WriteSlot( const ByteString & rShellName,
- USHORT nCount, const ByteString & rSlotId,
+ sal_uInt16 nCount, const ByteString & rSlotId,
SvSlotElementList &rList,
const ByteString & rPrefix,
SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void Write( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
void SetEnumValue(SvMetaEnumValue *p)
{ pEnumValue = p; }
#endif
protected:
- void SetCachable( BOOL bSet )
+ void SetCachable( sal_Bool bSet )
{
aCachable = bSet;
if( bSet )
- aVolatile = FALSE;
+ aVolatile = sal_False;
}
- void SetVolatile( BOOL bSet )
+ void SetVolatile( sal_Bool bSet )
{
aVolatile = bSet;
if( bSet )
- aCachable = FALSE;
+ aCachable = sal_False;
}
- void SetToggle( BOOL bSet )
+ void SetToggle( sal_Bool bSet )
{
aToggle = bSet;
}
- void SetAutoUpdate( BOOL bSet )
+ void SetAutoUpdate( sal_Bool bSet )
{
aAutoUpdate = bSet;
}
- void SetSynchron( BOOL bSet )
+ void SetSynchron( sal_Bool bSet )
{
aSynchron = bSet;
if( bSet )
- aAsynchron = FALSE;
+ aAsynchron = sal_False;
}
- void SetAsynchron( BOOL bSet )
+ void SetAsynchron( sal_Bool bSet )
{
aAsynchron = bSet;
if( bSet )
- aSynchron = FALSE;
+ aSynchron = sal_False;
}
- void SetRecordPerItem( BOOL bSet )
+ void SetRecordPerItem( sal_Bool bSet )
{
aRecordPerItem = bSet;
if( bSet )
- aRecordPerSet = aRecordManual = aNoRecord = FALSE;
+ aRecordPerSet = aRecordManual = aNoRecord = sal_False;
}
- void SetRecordPerSet( BOOL bSet )
+ void SetRecordPerSet( sal_Bool bSet )
{
aRecordPerSet = bSet;
if( bSet )
- aRecordPerItem = aRecordManual = aNoRecord = FALSE;
+ aRecordPerItem = aRecordManual = aNoRecord = sal_False;
}
- void SetRecordManual( BOOL bSet )
+ void SetRecordManual( sal_Bool bSet )
{
aRecordManual = bSet;
if( bSet )
- aRecordPerItem = aRecordPerSet = aNoRecord = FALSE;
+ aRecordPerItem = aRecordPerSet = aNoRecord = sal_False;
}
- void SetNoRecord( BOOL bSet )
+ void SetNoRecord( sal_Bool bSet )
{
aNoRecord = bSet;
if( bSet )
- aRecordPerItem = aRecordPerSet = aRecordManual = FALSE;
+ aRecordPerItem = aRecordPerSet = aRecordManual = sal_False;
}
- void SetRecordAbsolute( BOOL bSet )
+ void SetRecordAbsolute( sal_Bool bSet )
{ aRecordAbsolute = bSet; }
- void SetHasDialog( BOOL bSet )
+ void SetHasDialog( sal_Bool bSet )
{ aHasDialog = bSet; }
- void SetMenuConfig( BOOL bSet )
+ void SetMenuConfig( sal_Bool bSet )
{ aMenuConfig = bSet; }
- void SetToolBoxConfig( BOOL bSet )
+ void SetToolBoxConfig( sal_Bool bSet )
{ aToolBoxConfig = bSet; }
- void SetStatusBarConfig( BOOL bSet )
+ void SetStatusBarConfig( sal_Bool bSet )
{ aStatusBarConfig = bSet; }
- void SetAccelConfig( BOOL bSet )
+ void SetAccelConfig( sal_Bool bSet )
{ aAccelConfig = bSet; }
- void SetAllConfig( BOOL bSet )
+ void SetAllConfig( sal_Bool bSet )
{
aMenuConfig = bSet;
aToolBoxConfig = bSet;
aStatusBarConfig = bSet;
aAccelConfig = bSet;
}
- void SetFastCall( BOOL bSet )
+ void SetFastCall( sal_Bool bSet )
{ aFastCall = bSet; }
- void SetContainer( BOOL bSet )
+ void SetContainer( sal_Bool bSet )
{ aContainer = bSet; }
- void SetImageRotation( BOOL bSet )
+ void SetImageRotation( sal_Bool bSet )
{ aImageRotation = bSet; }
- void SetImageReflection( BOOL bSet )
+ void SetImageReflection( sal_Bool bSet )
{ aImageReflection = bSet; }
public:
@@ -187,84 +187,84 @@ public:
SvMetaSlot();
SvMetaSlot( SvMetaType * pType );
- virtual BOOL IsVariable() const;
- virtual BOOL IsMethod() const;
- virtual ByteString GetMangleName( BOOL bVariable ) const;
+ virtual sal_Bool IsVariable() const;
+ virtual sal_Bool IsMethod() const;
+ virtual ByteString GetMangleName( sal_Bool bVariable ) const;
SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const;
- BOOL GetHasCoreId() const;
+ sal_Bool GetHasCoreId() const;
const ByteString & GetGroupId() const;
const ByteString & GetConfigId() const;
const ByteString & GetExecMethod() const;
const ByteString & GetStateMethod() const;
const ByteString & GetDefault() const;
const ByteString & GetDisableFlags() const;
- BOOL GetPseudoSlots() const;
+ sal_Bool GetPseudoSlots() const;
/*
- BOOL GetGet() const;
- BOOL GetSet() const;
+ sal_Bool GetGet() const;
+ sal_Bool GetSet() const;
*/
- BOOL GetCachable() const;
- BOOL GetVolatile() const;
- BOOL GetToggle() const;
- BOOL GetAutoUpdate() const;
+ sal_Bool GetCachable() const;
+ sal_Bool GetVolatile() const;
+ sal_Bool GetToggle() const;
+ sal_Bool GetAutoUpdate() const;
- BOOL GetSynchron() const;
- BOOL GetAsynchron() const;
+ sal_Bool GetSynchron() const;
+ sal_Bool GetAsynchron() const;
- BOOL GetRecordPerItem() const;
- BOOL GetRecordPerSet() const;
- BOOL GetRecordManual() const;
- BOOL GetNoRecord() const;
- BOOL GetRecordAbsolute() const;
+ sal_Bool GetRecordPerItem() const;
+ sal_Bool GetRecordPerSet() const;
+ sal_Bool GetRecordManual() const;
+ sal_Bool GetNoRecord() const;
+ sal_Bool GetRecordAbsolute() const;
- BOOL GetHasDialog() const;
+ sal_Bool GetHasDialog() const;
const ByteString & GetPseudoPrefix() const;
const ByteString & GetUnoName() 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;
+ 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;
SvMetaSlot* GetLinkedSlot() const
{ return pLinkedSlot; }
SvMetaSlot* GetNextSlot() const
{ return pNextSlot; }
- ULONG GetListPos() const
+ sal_uLong GetListPos() const
{ return nListPos; }
- void SetListPos(ULONG n)
+ void SetListPos(sal_uLong n)
{ nListPos = n; }
void ResetSlotPointer()
{ pNextSlot = pLinkedSlot = 0; }
-// void FillSbxObject( SvIdlDataBase & rBase, SbxObject *, BOOL bProp );
+// void FillSbxObject( SvIdlDataBase & rBase, SbxObject *, sal_Bool bProp );
#ifdef IDL_COMPILER
SvMetaEnumValue* GetEnumValue() const
{ return pEnumValue; }
- virtual BOOL Test( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ SvStream & rOutStm, sal_uInt16 nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
virtual void Insert( SvSlotElementList&, const ByteString & rPrefix,
SvIdlDataBase& );
void WriteSlotStubs( const ByteString & rShellName,
ByteStringList & rList,
SvStream & rOutStm );
- USHORT WriteSlotMap( const ByteString & rShellName,
- USHORT nCount,
+ sal_uInt16 WriteSlotMap( const ByteString & rShellName,
+ sal_uInt16 nCount,
SvSlotElementList&,
const ByteString &,
SvIdlDataBase & rBase,
SvStream & rOutStm );
- USHORT WriteSlotParamArray( SvIdlDataBase & rBase,
+ sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvStream & rOutStm );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pIdTable );
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 5393981a7a4f..bb12b9291b27 100644..100755
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -48,77 +48,77 @@ class SvMetaAttribute : public SvMetaReference
SvBOOL aIsCollection;
SvBOOL aReadOnlyDoc;
SvBOOL aHidden;
- BOOL bNewAttr;
+ sal_Bool bNewAttr;
protected:
#ifdef IDL_COMPILER
virtual void WriteCSource( SvIdlDataBase & rBase,
- SvStream & rOutStm, BOOL bSet );
- ULONG MakeSlotValue( SvIdlDataBase & rBase, BOOL bVariable ) const;
+ SvStream & rOutStm, sal_Bool bSet );
+ sal_uLong MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const;
virtual void WriteAttributes( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaAttribute, SvMetaReference, 2 )
SvMetaAttribute();
SvMetaAttribute( SvMetaType * );
- void SetNewAttribute( BOOL bNew )
+ void SetNewAttribute( sal_Bool bNew )
{ bNewAttr = bNew; }
- BOOL IsNewAttribute() const
+ sal_Bool IsNewAttribute() const
{ return bNewAttr; }
- BOOL GetReadonly() const;
+ sal_Bool GetReadonly() const;
void SetSlotId( const SvNumberIdentifier & rId )
{ aSlotId = rId; }
const SvNumberIdentifier & GetSlotId() const;
- void SetExport( BOOL bSet )
+ void SetExport( sal_Bool bSet )
{ aExport = bSet; }
- BOOL GetExport() const;
+ sal_Bool GetExport() const;
- void SetHidden( BOOL bSet )
+ void SetHidden( sal_Bool bSet )
{ aHidden = bSet; }
- BOOL GetHidden() const;
+ sal_Bool GetHidden() const;
- void SetAutomation( BOOL bSet )
+ void SetAutomation( sal_Bool bSet )
{ aAutomation = bSet; }
- BOOL GetAutomation() const;
+ sal_Bool GetAutomation() const;
- void SetIsCollection( BOOL bSet )
+ void SetIsCollection( sal_Bool bSet )
{ aIsCollection = bSet; }
- BOOL GetIsCollection() const;
- void SetReadOnlyDoc( BOOL bSet )
+ sal_Bool GetIsCollection() const;
+ void SetReadOnlyDoc( sal_Bool bSet )
{ aReadOnlyDoc = bSet; }
- BOOL GetReadOnlyDoc() const;
+ sal_Bool GetReadOnlyDoc() const;
void SetType( SvMetaType * pT ) { aType = pT; }
SvMetaType * GetType() const;
- virtual BOOL IsMethod() const;
- virtual BOOL IsVariable() const;
- virtual ByteString GetMangleName( BOOL bVariable ) const;
+ virtual sal_Bool IsMethod() const;
+ virtual sal_Bool IsVariable() const;
+ virtual ByteString GetMangleName( sal_Bool bVariable ) const;
-// void FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags = 0 );
-// virtual void FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj, BOOL bVariable );
+// void FillSbxObject( SbxInfo * pInfo, sal_uInt16 nSbxFlags = 0 );
+// virtual void FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj, sal_Bool bVariable );
#ifdef IDL_COMPILER
- virtual BOOL Test( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType );
void WriteRecursiv_Impl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- ULONG MakeSfx( ByteString * pAtrrArray );
+ sal_uLong MakeSfx( ByteString * pAtrrArray );
virtual void Insert( SvSlotElementList&, const ByteString & rPrefix,
SvIdlDataBase& );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -152,30 +152,30 @@ class SvMetaType : public SvMetaExtern
SvIdentifier aBasicName;
SvMetaAttributeMemberList * pAttrList;
int nType;
- BOOL bIsItem;
- BOOL bIsShell;
+ sal_Bool bIsItem;
+ sal_Bool bIsShell;
char cParserChar;
#ifdef IDL_COMPILER
void WriteSfxItem( const ByteString & rItemName, SvIdlDataBase & rBase,
SvStream & rOutStm );
protected:
- BOOL ReadNamesSvIdl( SvIdlDataBase & rBase,
+ sal_Bool ReadNamesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
- USHORT nTab );
+ sal_uInt16 nTab );
virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- BOOL ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
void WriteHeaderSvIdl( SvIdlDataBase &, SvStream & rOutStm,
- USHORT nTab );
+ sal_uInt16 nTab );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
@@ -188,7 +188,7 @@ public:
const ByteString & rBasicPostfix/*, SbxDataType nT = SbxEMPTY */);
SvMetaAttributeMemberList & GetAttrList() const;
- ULONG GetAttrCount() const
+ sal_uLong GetAttrCount() const
{
return pAttrList ? pAttrList->Count() : 0L;
}
@@ -201,18 +201,18 @@ public:
int GetType() const { return nType; }
SvMetaType * GetBaseType() const;
SvMetaType * GetReturnType() const;
- BOOL IsItem() const { return bIsItem; }
- BOOL IsShell() const { return bIsShell; }
+ sal_Bool IsItem() const { return bIsItem; }
+ sal_Bool IsShell() const { return bIsShell; }
// void SetSbxDataType( SbxDataType nT )
// { aSbxDataType = (int)nT; }
// SbxDataType GetSbxDataType() const;
- void SetIn( BOOL b ) { aIn = b; }
- BOOL GetIn() const;
+ void SetIn( sal_Bool b ) { aIn = b; }
+ sal_Bool GetIn() const;
- void SetOut( BOOL b ) { aOut = b; }
- BOOL GetOut() const;
+ void SetOut( sal_Bool b ) { aOut = b; }
+ sal_Bool GetOut() const;
void SetCall0( int e );
int GetCall0() const;
@@ -231,29 +231,29 @@ public:
const ByteString & GetCName() const;
char GetParserChar() const { return cParserChar; }
- virtual BOOL SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
-// void FillSbxObject( SbxVariable * pObj, BOOL bVariable );
+// void FillSbxObject( SbxVariable * pObj, sal_Bool bVariable );
#ifdef IDL_COMPILER
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
ByteString GetCString() const;
- void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
void AppendParserString (ByteString &rString);
- ULONG MakeSfx( ByteString * pAtrrArray );
+ sal_uLong MakeSfx( ByteString * pAtrrArray );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
- //BOOL ReadTypePrefix( SvIdlDataBase &, SvTokenStream & rInStm );
- BOOL ReadMethodArgs( SvIdlDataBase & rBase,
+ //sal_Bool ReadTypePrefix( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
- void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
- void WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
- void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
+ 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 );
ByteString GetParserString() const;
void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
const ByteString & rChief );
@@ -284,9 +284,9 @@ public:
SvMetaEnumValue();
#ifdef IDL_COMPILER
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual sal_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,
WriteType, WriteAttribute = 0 );
#endif
};
@@ -303,26 +303,26 @@ protected:
#ifdef IDL_COMPILER
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
- USHORT nTab );
- virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ sal_uInt16 nTab );
+ virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaTypeEnum, SvMetaType, 21 )
SvMetaTypeEnum();
- USHORT GetMaxValue() const;
- ULONG Count() const { return aEnumValueList.Count(); }
+ sal_uInt16 GetMaxValue() const;
+ sal_uLong Count() const { return aEnumValueList.Count(); }
const ByteString & GetPrefix() const { return aPrefix; }
- SvMetaEnumValue * GetObject( ULONG n ) const
+ SvMetaEnumValue * GetObject( sal_uLong n ) const
{ return aEnumValueList.GetObject( n ); }
#ifdef IDL_COMPILER
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
#endif
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 00:30:27 +0000