summaryrefslogtreecommitdiff
path: root/idl/source/objects
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-18 15:49:47 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-18 15:49:47 +0100
commitb2f0133220474fda94f620b1916ba8d9ce839ba9 (patch)
tree581aa27c330a2b9a1a5b9a17c7d76f7e583daa02 /idl/source/objects
parente1050cc8589df4dd685d0fae2079dd306d1f09ff (diff)
parentee429287783ba7f9fe100cb3b32e64076d39c0c9 (diff)
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts: avmedia/source/framework/mediacontrol.cxx connectivity/source/commontools/DateConversion.cxx desktop/source/deployment/registry/component/dp_component.cxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/txtrange.hxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editview.cxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/misc/txtrange.cxx editeng/source/outliner/outlin2.cxx editeng/source/outliner/outlvw.cxx framework/source/layoutmanager/layoutmanager.cxx linguistic/source/lngsvcmgr.hxx sfx2/source/appl/app.cxx sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appdde.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/fileobj.hxx sfx2/source/appl/workwin.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macro.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/statcach.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styledlg.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplcitem.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/new.cxx sfx2/source/doc/objcont.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/objxtor.cxx sfx2/source/inc/appdata.hxx sfx2/source/inc/helpid.hrc sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/statcach.hxx sfx2/source/inc/templdgi.hxx sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnumgr.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/statbar/stbitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/frame2.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/sfxbasecontroller.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewfrm2.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx svx/inc/svx/svditer.hxx svx/source/dialog/sdstring.src svx/source/form/fmpage.cxx svx/source/form/formcontroller.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svditer.cxx svx/source/svdraw/svdview.cxx xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'idl/source/objects')
-rwxr-xr-x[-rw-r--r--]idl/source/objects/basobj.cxx114
-rwxr-xr-x[-rw-r--r--]idl/source/objects/bastype.cxx146
-rwxr-xr-x[-rw-r--r--]idl/source/objects/makefile.mk0
-rwxr-xr-x[-rw-r--r--]idl/source/objects/module.cxx86
-rwxr-xr-x[-rw-r--r--]idl/source/objects/object.cxx120
-rwxr-xr-x[-rw-r--r--]idl/source/objects/slot.cxx214
-rwxr-xr-x[-rw-r--r--]idl/source/objects/types.cxx272
7 files changed, 476 insertions, 476 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 7ae3def89d..e6ca91fba1 100644..100755
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -53,7 +53,7 @@ void SvMetaObject::Save( SvPersistStream & )
}
#ifdef IDL_COMPILER
-void SvMetaObject::WriteTab( SvStream & rOutStm, USHORT nTab )
+void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab )
{
while( nTab-- )
rOutStm << " ";
@@ -67,18 +67,18 @@ void SvMetaObject::WriteStars( SvStream & rOutStm )
rOutStm << '/' << endl;
}
-BOOL SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, ULONG nBegPos )
+sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
{
// write no empty brackets
- ULONG nPos = rOutStm.Tell();
+ sal_uLong nPos = rOutStm.Tell();
rOutStm.Seek( nBegPos );
- BOOL bOnlySpace = TRUE;
+ sal_Bool bOnlySpace = sal_True;
while( bOnlySpace && rOutStm.Tell() < nPos )
{
char c;
rOutStm >> c;
if( !isspace( c ) )
- bOnlySpace = FALSE;
+ bOnlySpace = sal_False;
}
if( bOnlySpace )
// nothing written
@@ -91,7 +91,7 @@ BOOL SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, ULONG nBegPos )
void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
{
// write no empty brackets
- ULONG nPos = rOutStm.Tell();
+ sal_uLong nPos = rOutStm.Tell();
rOutStm.SeekRel( -1 );
char c = 0;
rOutStm >> c;
@@ -108,25 +108,25 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
rOutStm.Seek( nPos );
}
-BOOL SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
+sal_Bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
{
- return FALSE;
+ return sal_False;
}
-void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
{
}
-void SvMetaObject::Write( SvIdlDataBase &, SvStream &, USHORT /*nTab */,
+void SvMetaObject::Write( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */,
WriteType, WriteAttribute )
{
}
-void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
{
}
-void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
{
}
@@ -140,7 +140,7 @@ SvMetaName::SvMetaName()
void SvMetaName::Load( SvPersistStream & rStm )
{
SvMetaObject::Load( rStm );
- BYTE nMask;
+ sal_uInt8 nMask;
rStm >> nMask;
if( nMask >= 0x20 )
@@ -159,7 +159,7 @@ void SvMetaName::Load( SvPersistStream & rStm )
void SvMetaName::Save( SvPersistStream & rStm )
{
SvMetaObject::Save( rStm );
- BYTE nMask = 0;
+ sal_uInt8 nMask = 0;
if( aName.IsSet() ) nMask |= 0x01;
if( aHelpContext.IsSet() ) nMask |= 0x02;
if( aHelpText.IsSet() ) nMask |= 0x04;
@@ -174,32 +174,32 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( nMask & 0x10 ) rStm << aDescription;
}
-BOOL SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
+sal_Bool SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
{
aName = rName;
- return TRUE;
+ return sal_True;
}
#ifdef IDL_COMPILER
-BOOL SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
// read module name
if( pTok->IsIdentifier() )
if( SetName( pTok->GetString(), &rBase ) )
- return TRUE;
+ return sal_True;
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
if( aName.ReadSvIdl( SvHash_Name(), rInStm ) )
{
if( !SetName( aName, &rBase ) )
@@ -214,7 +214,7 @@ void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
void SvMetaName::DoReadContextSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm, char cDel )
{
- UINT32 nBeginPos = 0; // can not happen with Tell
+ sal_uInt32 nBeginPos = 0; // can not happen with Tell
while( nBeginPos != rInStm.Tell() )
{
nBeginPos = rInStm.Tell();
@@ -230,12 +230,12 @@ void SvMetaName::ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & )
{
}
-BOOL SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
+sal_Bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
{
- return TRUE;
+ return sal_True;
}
-void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, USHORT )
+void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 )
{
}
@@ -244,7 +244,7 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
rOutStm << "<DESCRIPTION>" << endl;
ByteString aDesc( GetDescription() );
- USHORT nPos = aDesc.Search( '\n' );
+ sal_uInt16 nPos = aDesc.Search( '\n' );
while ( nPos != STRING_NOTFOUND )
{
rOutStm << aDesc.Copy( 0, nPos ).GetBuffer() << endl;
@@ -257,7 +257,7 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
if( aHelpContext.IsSet() || aHelpText.IsSet() || aConfigName.IsSet() )
{
@@ -284,13 +284,13 @@ void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
}
}
-BOOL SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
- BOOL bOk = TRUE;
+ sal_uInt32 nTokPos = rInStm.Tell();
+ sal_Bool bOk = sal_True;
if( rInStm.Read( '[' ) )
{
- UINT32 nBeginPos = 0; // can not happen with Tell
+ sal_uInt32 nBeginPos = 0; // can not happen with Tell
while( nBeginPos != rInStm.Tell() )
{
nBeginPos = rInStm.Tell();
@@ -315,12 +315,12 @@ BOOL SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
- ULONG nBeginPos = rOutStm.Tell();
+ sal_uLong nBeginPos = rOutStm.Tell();
WriteTab( rOutStm, nTab );
rOutStm << '[' << endl;
- ULONG nOldPos = rOutStm.Tell();
+ sal_uLong nOldPos = rOutStm.Tell();
WriteAttributesSvIdl( rBase, rOutStm, nTab +1 );
// write no empty brackets
@@ -352,25 +352,25 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
}
void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
- ULONG nBeginPos = rOutStm.Tell();
+ sal_uLong nBeginPos = rOutStm.Tell();
WriteTab( rOutStm, nTab );
rOutStm << '[' << endl;
- ULONG nOldPos = rOutStm.Tell();
+ sal_uLong nOldPos = rOutStm.Tell();
WriteAttributes( rBase, rOutStm, nTab +1, nT, nA );
// write no empty brackets
- ULONG nPos = rOutStm.Tell();
+ sal_uLong nPos = rOutStm.Tell();
rOutStm.Seek( nOldPos );
- BOOL bOnlySpace = TRUE;
+ sal_Bool bOnlySpace = sal_True;
while( bOnlySpace && rOutStm.Tell() < nPos )
{
char c;
rOutStm >> c;
if( !isspace( c ) )
- bOnlySpace = FALSE;
+ bOnlySpace = sal_False;
}
if( bOnlySpace )
// nothing written
@@ -384,7 +384,7 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType, WriteAttribute )
{
if( GetHelpText().IsSet() || GetHelpContext().IsSet() )
@@ -408,7 +408,7 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
}
void SvMetaName::WriteContext( SvIdlDataBase &, SvStream &,
- USHORT,
+ sal_uInt16,
WriteType, WriteAttribute )
{
}
@@ -424,7 +424,7 @@ void SvMetaReference::Load( SvPersistStream & rStm )
{
SvMetaName::Load( rStm );
- BYTE nMask;
+ sal_uInt8 nMask;
rStm >> nMask;
if( nMask >= 0x2 )
{
@@ -445,7 +445,7 @@ void SvMetaReference::Save( SvPersistStream & rStm )
SvMetaName::Save( rStm );
// create mask
- BYTE nMask = 0;
+ sal_uInt8 nMask = 0;
if( aRef.Is() )
nMask |= 0x01;
@@ -458,8 +458,8 @@ SV_IMPL_META_FACTORY1( SvMetaExtern, SvMetaReference );
SvMetaExtern::SvMetaExtern()
: pModule( NULL )
- , bReadUUId( FALSE )
- , bReadVersion( FALSE )
+ , bReadUUId( sal_False )
+ , bReadVersion( sal_False )
{
}
@@ -467,7 +467,7 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
{
SvMetaReference::Load( rStm );
- BYTE nMask;
+ sal_uInt8 nMask;
rStm >> nMask;
if( nMask >= 0x20 )
{
@@ -478,8 +478,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 = TRUE;
- if( nMask & 0x10 ) bReadVersion = TRUE;
+ if( nMask & 0x08 ) bReadUUId = sal_True;
+ if( nMask & 0x10 ) bReadVersion = sal_True;
}
void SvMetaExtern::Save( SvPersistStream & rStm )
@@ -487,7 +487,7 @@ void SvMetaExtern::Save( SvPersistStream & rStm )
SvMetaReference::Save( rStm );
// create mask
- BYTE nMask = 0;
+ sal_uInt8 nMask = 0;
if( pModule ) nMask |= 0x01;
if( aUUId != SvGlobalName() ) nMask |= 0x02;
if( aVersion != SvVersion() ) nMask |= 0x04;
@@ -527,13 +527,13 @@ void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase,
{
SvMetaReference::ReadAttributesSvIdl( rBase, rInStm );
if( aUUId.ReadSvIdl( rBase, rInStm ) )
- bReadUUId = TRUE;
+ bReadUUId = sal_True;
if( aVersion.ReadSvIdl( rInStm ) )
- bReadVersion = TRUE;
+ bReadVersion = sal_True;
}
void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab )
+ SvStream & rOutStm, sal_uInt16 nTab )
{
SvMetaReference::WriteAttributesSvIdl( rBase, rOutStm, nTab );
if( bReadUUId || bReadVersion )
@@ -556,7 +556,7 @@ void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
}
}
-BOOL SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
SetModule( rBase );
GetUUId(); // id gets created
@@ -564,20 +564,20 @@ BOOL SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
void SvMetaExtern::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
SvMetaReference::WriteSvIdl( rBase, rOutStm, nTab );
}
void SvMetaExtern::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
SvMetaReference::Write( rBase, rOutStm, nTab, nT, nA );
}
void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
SvMetaReference::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 91356dd4a1..3ba2c8d1da 100644..100755
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -40,50 +40,50 @@
#include <database.hxx>
#ifdef IDL_COMPILER
-static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
- ULONG nMin, ULONG nMax, ULONG* pValue )
+static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
+ sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
- BOOL bOk = FALSE;
+ sal_Bool bOk = sal_False;
if( rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken_Next();
if( pTok->IsInteger() )
{
- ULONG n = pTok->GetNumber();
+ sal_uLong n = pTok->GetNumber();
if ( n >= nMin && n <= nMax )
{
*pValue = n;
- bOk = TRUE;
+ bOk = sal_True;
}
}
}
if( bOk )
- return TRUE;
+ return sal_True;
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
#endif
-UINT32 SvUINT32::Read( SvStream & rStm )
+sal_uInt32 SvUINT32::Read( SvStream & rStm )
{
return SvPersistStream::ReadCompressed( rStm );
}
-void SvUINT32::Write( SvStream & rStm, UINT32 nVal )
+void SvUINT32::Write( SvStream & rStm, sal_uInt32 nVal )
{
SvPersistStream::WriteCompressed( rStm, nVal );
}
SvStream& operator << (SvStream & rStm, const SvBOOL & rb )
{
- BYTE n = rb.nVal;
+ sal_uInt8 n = rb.nVal;
if( rb.bSet )
n |= 0x02;
rStm << n;
@@ -91,10 +91,10 @@ SvStream& operator << (SvStream & rStm, const SvBOOL & rb )
}
SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
{
- BYTE n;
+ sal_uInt8 n;
rStm >> n;
- rb.nVal = (n & 0x01) ? TRUE : FALSE;
- rb.bSet = (n & 0x02) ? TRUE : FALSE;
+ rb.nVal = (n & 0x01) ? sal_True : sal_False;
+ rb.bSet = (n & 0x02) ? sal_True : sal_False;
if( n & ~0x03 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
@@ -113,11 +113,11 @@ SvStream& operator << (SvStream & rStm, const SvVersion & r )
int n = r.GetMajorVersion() << 4;
n |= r.GetMinorVersion();
- rStm << (BYTE)n;
+ rStm << (sal_uInt8)n;
}
else
{
- rStm << (BYTE)0;
+ rStm << (sal_uInt8)0;
rStm << r.GetMajorVersion();
rStm << r.GetMinorVersion();
}
@@ -126,7 +126,7 @@ SvStream& operator << (SvStream & rStm, const SvVersion & r )
SvStream& operator >> (SvStream & rStm, SvVersion & r )
{
- BYTE n;
+ sal_uInt8 n;
rStm >> n;
if( n == 0 )
{ // not compressed
@@ -143,15 +143,15 @@ SvStream& operator >> (SvStream & rStm, SvVersion & r )
#ifdef IDL_COMPILER
-BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
- BOOL bOk = TRUE;
- BOOL bBraket = rInStm.Read( '(' );
+ sal_Bool bOk = sal_True;
+ sal_Bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken();
@@ -165,21 +165,21 @@ BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
bOk = rInStm.Read( ')' );
}
else
- *this = TRUE; //default action set to TRUE
+ *this = sal_True; //default action set to TRUE
if( bOk )
- return TRUE;
+ return sal_True;
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
-BOOL SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
+sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
{
if( nVal )
rOutStm << pName->GetName().GetBuffer();
else
rOutStm << pName->GetName().GetBuffer() << "(FALSE)";
- return TRUE;
+ return sal_True;
}
ByteString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
@@ -195,15 +195,15 @@ ByteString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
}
-BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
- BOOL bOk = TRUE;
- BOOL bBraket = rInStm.Read( '(' );
+ sal_Bool bOk = sal_True;
+ sal_Bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken();
@@ -216,19 +216,19 @@ BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
bOk = rInStm.Read( ')' );
}
if( bOk )
- return TRUE;
+ return sal_True;
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
-BOOL SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
+sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
SvStream & rOutStm,
- USHORT /*nTab */ )
+ sal_uInt16 /*nTab */ )
{
rOutStm << pName->GetName().GetBuffer() << '(';
rOutStm << GetBuffer() << ')';
- return TRUE;
+ return sal_True;
}
SvStream& operator << (SvStream & rStm, const SvIdentifier & r )
@@ -244,17 +244,17 @@ SvStream& operator >> (SvStream & rStm, SvIdentifier & r )
}
-BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
SvStringHashEntry * pName,
SvTokenStream & rInStm )
{
if( SvIdentifier::ReadSvIdl( pName, rInStm ) )
{
- ULONG n;
+ sal_uLong n;
if( rBase.FindId( *this, &n ) )
{
nValue = n;
- return TRUE;
+ return sal_True;
}
else
{
@@ -265,23 +265,23 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
rBase.WriteError( rInStm );
}
}
- return FALSE;
+ return sal_False;
}
-BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsIdentifier() )
{
- ULONG n;
+ sal_uLong n;
if( rBase.FindId( pTok->GetString(), &n ) )
{
*(ByteString *)this = pTok->GetString();
nValue = n;
- return TRUE;
+ return sal_True;
}
else
{
@@ -293,7 +293,7 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
}
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
SvStream& operator << (SvStream & rStm, const SvNumberIdentifier & r )
@@ -311,15 +311,15 @@ SvStream& operator >> (SvStream & rStm, SvNumberIdentifier & r )
}
-BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
- BOOL bOk = TRUE;
- BOOL bBraket = rInStm.Read( '(' );
+ sal_Bool bOk = sal_True;
+ sal_Bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken();
@@ -332,18 +332,18 @@ BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
bOk = rInStm.Read( ')' );
}
if( bOk )
- return TRUE;
+ return sal_True;
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
-BOOL SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
- USHORT /*nTab */ )
+sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+ sal_uInt16 /*nTab */ )
{
rOutStm << pName->GetName().GetBuffer() << "(\"";
rOutStm << GetBuffer() << "\")";
- return TRUE;
+ return sal_True;
}
SvStream& operator << (SvStream & rStm, const SvString & r )
@@ -359,25 +359,25 @@ SvStream& operator >> (SvStream & rStm, SvString & r )
}
-BOOL SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
+sal_Bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
{
return SvString::ReadSvIdl( SvHash_HelpText(), rInStm );
}
-BOOL SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT nTab )
+sal_Bool SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab )
{
return SvString::WriteSvIdl( SvHash_HelpText(), rOutStm, nTab );
}
-BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
+sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( SvHash_uuid() ) )
{
- BOOL bOk = TRUE;
- BOOL bBraket = rInStm.Read( '(' );
+ sal_Bool bOk = sal_True;
+ sal_Bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken();
@@ -390,51 +390,51 @@ BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
bOk = rInStm.Read( ')' );
}
if( bOk )
- return TRUE;
+ return sal_True;
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
-BOOL SvUUId::WriteSvIdl( SvStream & rOutStm )
+sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
{
// write global id
rOutStm << SvHash_uuid()->GetName().GetBuffer() << "(\"";
rOutStm << ByteString( GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << "\")";
- return TRUE;
+ return sal_True;
}
-BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm )
+sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
{
- ULONG n = 0;
+ sal_uLong n = 0;
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) )
{
- nMajorVersion = (USHORT)n;
+ nMajorVersion = (sal_uInt16)n;
if( rInStm.Read( '.' ) )
{
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsInteger() && pTok->GetNumber() <= 0xFFFF )
{
- nMinorVersion = (USHORT)pTok->GetNumber();
- return TRUE;
+ nMinorVersion = (sal_uInt16)pTok->GetNumber();
+ return sal_True;
}
}
else
- return TRUE;
+ return sal_True;
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
-BOOL SvVersion::WriteSvIdl( SvStream & rOutStm )
+sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm )
{
rOutStm << SvHash_Version()->GetName().GetBuffer() << '('
<< ByteString::CreateFromInt32( nMajorVersion ).GetBuffer() << '.'
<< ByteString::CreateFromInt32( nMinorVersion ).GetBuffer() << ')';
- return TRUE;
+ return sal_True;
}
#endif //IDL_COMPILER
diff --git a/idl/source/objects/makefile.mk b/idl/source/objects/makefile.mk
index e141d85540..e141d85540 100644..100755
--- a/idl/source/objects/makefile.mk
+++ b/idl/source/objects/makefile.mk
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 6b7cdcf86f..84fe62e818 100644..100755
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -42,16 +42,16 @@ SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern );
SvMetaModule::SvMetaModule()
#ifdef IDL_COMPILER
- : bImported( FALSE )
- , bIsModified( FALSE )
+ : bImported( sal_False )
+ , bIsModified( sal_False )
#endif
{
}
#ifdef IDL_COMPILER
-SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp )
+SvMetaModule::SvMetaModule( const String & rIdlFileName, sal_Bool bImp )
: aIdlFileName( rIdlFileName )
- , bImported( bImp ), bIsModified( FALSE )
+ , bImported( bImp ), bIsModified( sal_False )
{
}
#endif
@@ -59,10 +59,10 @@ SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp )
#define MODULE_VER 0x0001
void SvMetaModule::Load( SvPersistStream & rStm )
{
- bImported = TRUE; // import always
+ bImported = sal_True; // import always
SvMetaExtern::Load( rStm );
- USHORT nVer;
+ sal_uInt16 nVer;
rStm >> nVer; // version
DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" );
@@ -77,7 +77,7 @@ void SvMetaModule::Load( SvPersistStream & rStm )
rStm.ReadByteString( aModulePrefix );
// read compiler data
- USHORT nCmpLen;
+ sal_uInt16 nCmpLen;
rStm >> nCmpLen;
#ifdef IDL_COMPILER
DBG_ASSERT( (nVer & IDL_WRITE_MASK) == IDL_WRITE_COMPILER,
@@ -94,7 +94,7 @@ void SvMetaModule::Save( SvPersistStream & rStm )
{
SvMetaExtern::Save( rStm );
- rStm << (USHORT)(MODULE_VER | IDL_WRITE_COMPILER); // version
+ rStm << (sal_uInt16)(MODULE_VER | IDL_WRITE_COMPILER); // Version
rStm << aClassList;
rStm << aTypeList;
@@ -106,43 +106,43 @@ void SvMetaModule::Save( SvPersistStream & rStm )
rStm.WriteByteString( aModulePrefix );
// write compiler data
- USHORT nCmpLen = 0;
- ULONG nLenPos = rStm.Tell();
+ sal_uInt16 nCmpLen = 0;
+ sal_uLong nLenPos = rStm.Tell();
rStm << nCmpLen;
#ifdef IDL_COMPILER
rStm << aBeginName;
rStm << aEndName;
rStm << aNextName;
// write length of compiler data
- ULONG nPos = rStm.Tell();
+ sal_uLong nPos = rStm.Tell();
rStm.Seek( nLenPos );
- rStm << (USHORT)( nPos - nLenPos - sizeof( USHORT ) );
+ rStm << (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) );
rStm.Seek( nPos );
#endif
}
-BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
{
if( pBase )
{
if( pBase->GetModule( rName ) )
- return FALSE;
+ return sal_False;
}
return SvMetaExtern::SetName( rName );
}
#ifdef IDL_COMPILER
-BOOL SvMetaModule::FillNextName( SvGlobalName * pName )
+sal_Bool SvMetaModule::FillNextName( SvGlobalName * pName )
{
*pName = aNextName;
if( aNextName < aEndName )
{
++aNextName;
- bIsModified = TRUE;
- return TRUE;
+ bIsModified = sal_True;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
@@ -153,7 +153,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
aHelpFileName.ReadSvIdl( SvHash_HelpFile(), rInStm );
if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.GetBuffer() ) ) )
{
ByteString aStr = "cannot read file: ";
@@ -170,7 +170,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
if( aTypeLibFile.Len() || aSlotIdFile.Len() || aTypeLibFile.Len() )
@@ -199,7 +199,7 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
if( rInStm.GetToken()->Is( SvHash_interface() )
|| rInStm.GetToken()->Is( SvHash_shell() ) )
{
@@ -239,7 +239,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
else if( rInStm.GetToken()->Is( SvHash_include() ) )
{
- BOOL bOk = FALSE;
+ sal_Bool bOk = sal_False;
rInStm.GetToken_Next();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
@@ -256,7 +256,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
// reset error
rBase.SetError( SvIdlError() );
- UINT32 nBeginPos = 0xFFFFFFFF; // can not happen with Tell
+ sal_uInt32 nBeginPos = 0xFFFFFFFF; // can not happen with Tell
while( nBeginPos != aTokStm.Tell() )
{
nBeginPos = aTokStm.Tell();
@@ -307,10 +307,10 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
SvMetaExtern::WriteContextSvIdl( rBase, rOutStm, nTab );
- ULONG n;
+ sal_uLong n;
for( n = 0; n < aTypeList.Count(); n++ )
{
WriteTab( rOutStm, nTab );
@@ -330,13 +330,13 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
}
}
-BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
- bIsModified = TRUE; // up to now always when compiler running
+ bIsModified = sal_True; // up to now always when compiler running
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
- BOOL bOk = FALSE;
+ sal_Bool bOk = sal_False;
bOk = pTok->Is( SvHash_module() );
if( bOk )
{
@@ -372,7 +372,7 @@ BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
rOutStm << SvHash_module()->GetName().GetBuffer() << endl
<< '\"';
@@ -385,7 +385,7 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
{
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
pClass->WriteSfx( rBase, rOutStm );
@@ -395,7 +395,7 @@ void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
Table* pTable )
{
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
pClass->WriteHelpIds( rBase, rOutStm, pTable );
@@ -404,7 +404,7 @@ void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
@@ -418,7 +418,7 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
}
void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
switch ( nT )
@@ -439,7 +439,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteTab( rOutStm, nTab );
rOutStm << "importlib(\"STDOLE.TLB\");" << endl;
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
if( !pClass->IsShell() && pClass->GetAutomation() )
@@ -463,7 +463,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
rOutStm << "</MODULE>" << endl << endl;
rOutStm << "<CLASSES>" << endl;
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
if( !pClass->IsShell() )
@@ -479,7 +479,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
rOutStm << " ( ";
- for( ULONG m=0; m<rClassList.Count(); m++ )
+ for( sal_uLong m=0; m<rClassList.Count(); m++ )
{
SvClassElement *pEle = rClassList.GetObject(m);
SvMetaClass *pCl = pEle->GetClass();
@@ -501,7 +501,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
case WRITE_C_SOURCE:
case WRITE_C_HEADER:
{
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
if( !pClass->IsShell() )
@@ -520,16 +520,16 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
{
if( aSlotIdFile.Len() )
rOutStm << "//#include <" << aSlotIdFile.GetBuffer() << '>' << endl;
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable );
}
}
void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
pClass->WriteHxx( rBase, rOutStm, nTab );
@@ -537,9 +537,9 @@ void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
}
void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
pClass->WriteCxx( rBase, rOutStm, nTab );
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index ad58705806..8adab562a8 100644..100755
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -46,7 +46,7 @@ SvClassElement::SvClassElement()
void SvClassElement::Load( SvPersistStream & rStm )
{
- BYTE nMask;
+ sal_uInt8 nMask;
rStm >> nMask;
if( nMask >= 0x08 )
{
@@ -67,7 +67,7 @@ void SvClassElement::Load( SvPersistStream & rStm )
void SvClassElement::Save( SvPersistStream & rStm )
{
// create mask
- BYTE nMask = 0;
+ sal_uInt8 nMask = 0;
if( aAutomation.IsSet() ) nMask |= 0x1;
if( aPrefix.Len() ) nMask |= 0x2;
if( xClass.Is() ) nMask |= 0x4;
@@ -81,7 +81,7 @@ void SvClassElement::Save( SvPersistStream & rStm )
SV_IMPL_META_FACTORY1( SvMetaClass, SvMetaType );
SvMetaClass::SvMetaClass()
- : aAutomation( TRUE, FALSE )
+ : aAutomation( sal_True, sal_False )
{
}
@@ -89,7 +89,7 @@ void SvMetaClass::Load( SvPersistStream & rStm )
{
SvMetaType::Load( rStm );
- BYTE nMask;
+ sal_uInt8 nMask;
rStm >> nMask;
if( nMask >= 0x20 )
{
@@ -119,7 +119,7 @@ void SvMetaClass::Save( SvPersistStream & rStm )
SvMetaType::Save( rStm );
// create mask
- BYTE nMask = 0;
+ sal_uInt8 nMask = 0;
if( aAttrList.Count() ) nMask |= 0x1;
if( aSuperClass.Is() ) nMask |= 0x2;
if( aClassList.Count() ) nMask |= 0x4;
@@ -144,7 +144,7 @@ void SvMetaClass::ReadAttributesSvIdl( SvIdlDataBase & rBase,
}
void SvMetaClass::WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab )
+ SvStream & rOutStm, sal_uInt16 nTab )
{
SvMetaType::WriteAttributesSvIdl( rBase, rOutStm, nTab );
@@ -164,7 +164,7 @@ void SvMetaClass::WriteAttributesSvIdl( SvIdlDataBase & rBase,
void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( SvHash_import() ) )
@@ -191,7 +191,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
rBase.WriteError( rInStm );
}
xAutomationInterface = pClass;
- xEle->SetAutomation( TRUE );
+ xEle->SetAutomation( sal_True );
}
else
{
@@ -228,7 +228,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
rInStm.Seek( nTokPos );
SvMetaType * pType = rBase.ReadKnownType( rInStm );
- BOOL bOk = FALSE;
+ sal_Bool bOk = sal_False;
SvMetaAttributeRef xAttr;
if( !pType || pType->IsItem() )
{
@@ -264,10 +264,10 @@ void SvMetaClass::WriteContextSvIdl
(
SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab
+ sal_uInt16 nTab
)
{
- ULONG n;
+ sal_uLong n;
for( n = 0; n < aAttrList.Count(); n++ )
{
WriteTab( rOutStm, nTab );
@@ -289,12 +289,12 @@ void SvMetaClass::WriteContextSvIdl
}
}
-BOOL SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
- ULONG nTokPos = rInStm.Tell();
+ sal_uLong nTokPos = rInStm.Tell();
if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_CLASS )
{
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
if( rInStm.Read( ':' ) )
{
aSuperClass = rBase.ReadKnownClass( rInStm );
@@ -316,10 +316,10 @@ BOOL SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
return bOk;
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
-BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const
{
if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) )
@@ -328,7 +328,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
OSL_FAIL( rAttr.GetSlotId().GetBuffer() );
}
- for( ULONG n = 0; n < aAttrList.Count(); n++ )
+ for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
{
SvMetaAttribute * pS = aAttrList.GetObject( n );
if( pS->GetName() == rAttr.GetName() )
@@ -346,13 +346,13 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
aStr += " with different id's";
rBase.SetError( aStr, rInStm.GetToken() );
rBase.WriteError( rInStm );
- return FALSE;
+ return sal_False;
}
}
else
{
- UINT32 nId1 = pS->GetSlotId().GetValue();
- UINT32 nId2 = rAttr.GetSlotId().GetValue();
+ sal_uInt32 nId1 = pS->GetSlotId().GetValue();
+ sal_uInt32 nId2 = rAttr.GetSlotId().GetValue();
if( nId1 == nId2 && nId1 != 0 )
{
OSL_FAIL( "Gleiche Id in MetaClass : " );
@@ -367,18 +367,18 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
aStr += " with equal id's";
rBase.SetError( aStr, rInStm.GetToken() );
rBase.WriteError( rInStm );
- return FALSE;
+ return sal_False;
}
}
}
SvMetaClass * pSC = aSuperClass;
if( pSC )
return pSC->TestAttribute( rBase, rInStm, rAttr );
- return TRUE;
+ return sal_True;
}
void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
WriteHeaderSvIdl( rBase, rOutStm, nTab );
if( aSuperClass.Is() )
@@ -389,7 +389,7 @@ void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
}
void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute )
{
rBase.aIFaceName = GetName();
@@ -417,7 +417,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
rOutStm << "</INTERFACE>" << endl << endl;
// write all attributes
- ULONG n;
+ sal_uLong n;
for( n = 0; n < aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -438,12 +438,12 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-USHORT SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
+sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
SvSlotElementList & rSlotList,
SvStream & rOutStm )
{
- USHORT nCount = 0;
- for( ULONG n = 0; n < rSlotList.Count(); n++ )
+ sal_uInt16 nCount = 0;
+ for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
{
SvSlotElement *pEle = rSlotList.GetObject( n );
SvMetaSlot *pAttr = pEle->xSlot;
@@ -453,13 +453,13 @@ USHORT SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
return nCount;
}
-USHORT SvMetaClass::WriteSlots( const ByteString & rShellName,
- USHORT nCount, SvSlotElementList & rSlotList,
+sal_uInt16 SvMetaClass::WriteSlots( const ByteString & rShellName,
+ sal_uInt16 nCount, SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm )
{
- USHORT nSCount = 0;
- for( ULONG n = 0; n < rSlotList.Count(); n++ )
+ sal_uInt16 nSCount = 0;
+ for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
{
rSlotList.Seek(n);
SvSlotElement * pEle = rSlotList.GetCurObject();
@@ -472,7 +472,7 @@ USHORT SvMetaClass::WriteSlots( const ByteString & rShellName,
return nSCount;
}
-void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<ULONG>& rSuperList,
+void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
SvMetaClassList &rClassList,
const ByteString & rPrefix, SvIdlDataBase& rBase)
{
@@ -484,14 +484,14 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<ULONG>& rSu
rClassList.push_back( this );
// write all direct attributes
- ULONG n;
+ sal_uLong n;
for( n = 0; n < aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
- ULONG nId = pAttr->GetSlotId().GetValue();
+ sal_uLong nId = pAttr->GetSlotId().GetValue();
- std::vector<ULONG>::iterator iter = std::find(rSuperList.begin(),
+ std::vector<sal_uLong>::iterator iter = std::find(rSuperList.begin(),
rSuperList.end(),nId);
if( iter == rSuperList.end() )
@@ -542,7 +542,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
rList.push_back( this );
// my imports
- for( ULONG n = 0; n < aClassList.Count(); n++ )
+ for( sal_uInt32 n = 0; n < aClassList.Count(); n++ )
{
SvClassElement * pEle = aClassList.GetObject( n );
SvMetaClass * pCl = pEle->GetClass();
@@ -561,7 +561,7 @@ void SvMetaClass::WriteSlotStubs( const ByteString & rShellName,
SvStream & rOutStm )
{
// write all attributes
- for( ULONG n = 0; n < rSlotList.Count(); n++ )
+ for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
{
SvSlotElement *pEle = rSlotList.GetObject( n );
SvMetaSlot *pAttr = pEle->xSlot;
@@ -588,21 +588,21 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
rOutStm << "SFX_ARGUMENTMAP(" << GetName().GetBuffer() << ')' << endl
<< '{' << endl;
- std::vector<ULONG> aSuperList;
+ std::vector<sal_uLong> aSuperList;
SvMetaClassList classList;
SvSlotElementList aSlotList;
InsertSlots(aSlotList, aSuperList, classList, ByteString(), rBase);
- for (ULONG n=0; n<aSlotList.Count(); n++ )
+ for (sal_uInt32 n=0; n<aSlotList.Count(); n++ )
{
SvSlotElement *pEle = aSlotList.GetObject( n );
SvMetaSlot *pSlot = pEle->xSlot;
pSlot->SetListPos(n);
}
- ULONG nSlotCount = aSlotList.Count();
+ sal_uLong nSlotCount = aSlotList.Count();
// write all attributes
- USHORT nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm );
+ sal_uInt16 nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm );
if( nArgCount )
Back2Delemitter( rOutStm );
else
@@ -641,7 +641,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
}
rOutStm << endl << "};" << endl << "#endif" << endl << endl;
- for( ULONG n=0; n<aSlotList.Count(); n++ )
+ for( sal_uLong n=0; n<aSlotList.Count(); n++ )
{
aSlotList.Seek(n);
SvSlotElement* pEle = aSlotList.GetCurObject();
@@ -649,14 +649,14 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
pAttr->ResetSlotPointer();
}
- for ( ULONG n=0; n<aSlotList.Count(); n++ )
+ for ( sal_uLong n=0; n<aSlotList.Count(); n++ )
delete aSlotList.GetObject(n);
}
void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
Table* pTable )
{
- for( ULONG n=0; n<aAttrList.Count(); n++ )
+ for( sal_uLong n=0; n<aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
pAttr->WriteHelpId( rBase, rOutStm, pTable );
@@ -666,14 +666,14 @@ void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaClass::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pTable )
{
- for( ULONG n=0; n<aAttrList.Count(); n++ )
+ for( sal_uLong n=0; n<aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
pAttr->WriteSrc( rBase, rOutStm, pTable );
}
}
-void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
{
ByteString aSuperName( "SvDispatch" );
if( GetSuperClass() )
@@ -686,11 +686,11 @@ void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
<< '{' << endl
<< "protected:" << endl
<< "\tvirtual SvGlobalName GetTypeName() const;" << endl
- << "\tvirtual BOOL FillTypeLibInfo( SvGlobalName *, USHORT * pMajor," << endl
- << "\t USHORT * pMinor ) const;" << endl
- << "\tvirtual BOOL FillTypeLibInfo( ByteString * pName, USHORT * pMajor," << endl;
+ << "\tvirtual sal_Bool FillTypeLibInfo( SvGlobalName *, sal_uInt16 * pMajor," << endl
+ << "\t sal_uInt16 * pMinor ) const;" << endl
+ << "\tvirtual sal_Bool FillTypeLibInfo( ByteString * pName, sal_uInt16 * pMajor," << endl;
rOutStm
- << "\t USHORT * pMinor ) const;" << endl
+ << "\t sal_uInt16 * pMinor ) const;" << endl
<< "\tvirtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) = 0;" << endl
<< "public:" << endl
<< "\t static SvGlobalName ClassName()" << endl
@@ -698,7 +698,7 @@ void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
<< "};" << endl;
}
-void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
{
ByteString aSuperName( "SvDispatch" );
if( GetSuperClass() )
@@ -714,26 +714,26 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
SvMetaModule * pMod = GetModule();
// FillTypeLibInfo
- rOutStm << "BOOL " << name.GetBuffer() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
- << "\t USHORT * pMajor," << endl
- << "\t USHORT * pMinor ) const" << endl
+ rOutStm << "sal_Bool " << name.GetBuffer() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
+ << "\t sal_uInt16 * pMajor," << endl
+ << "\t sal_uInt16 * pMinor ) const" << endl
<< '{' << endl
<< "\tSvGlobalName aN( " << ByteString( pMod->GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << " );" << endl;
rOutStm << "\t*pGN = aN;" << endl
<< "\t*pMajor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMajorVersion()).GetBuffer() << ';' << endl
<< "\t*pMinor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMinorVersion()).GetBuffer() << ';' << endl
- << "\treturn TRUE;" << endl
+ << "\treturn sal_True;" << endl
<< '}' << endl;
// FillTypeLibInfo
- rOutStm << "BOOL " << name.GetBuffer() << "::FillTypeLibInfo( ByteString * pName,"
- << "\t USHORT * pMajor," << endl
- << "\t USHORT * pMinor ) const" << endl;
+ rOutStm << "sal_Bool " << name.GetBuffer() << "::FillTypeLibInfo( ByteString * pName,"
+ << "\t sal_uInt16 * pMajor," << endl
+ << "\t sal_uInt16 * pMinor ) const" << endl;
rOutStm << '{' << endl
<< "\t*pName = \"" << pMod->GetTypeLibFileName().GetBuffer() << "\";" << endl
<< "\t*pMajor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMajorVersion()).GetBuffer() << ';' << endl
<< "\t*pMinor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMinorVersion()).GetBuffer() << ';' << endl
- << "\treturn TRUE;" << endl
+ << "\treturn sal_True;" << endl
<< '}' << endl;
rOutStm << "void " << name.GetBuffer() << "::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )" << endl
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 5b7c9215c0..06c161cdad 100644..100755
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -44,10 +44,10 @@ SvMetaObject *SvMetaSlot::MakeClone() const
}
SvMetaSlot::SvMetaSlot()
- : aCachable( TRUE, FALSE )
- , aSynchron( TRUE, FALSE )
- , aRecordPerSet( TRUE, FALSE )
- , aRecordAbsolute( FALSE, FALSE )
+ : aCachable( sal_True, sal_False )
+ , aSynchron( sal_True, sal_False )
+ , aRecordPerSet( sal_True, sal_False )
+ , aRecordAbsolute( sal_False, sal_False )
, pLinkedSlot(0)
, pNextSlot(0)
, pEnumValue(0)
@@ -56,10 +56,10 @@ SvMetaSlot::SvMetaSlot()
SvMetaSlot::SvMetaSlot( SvMetaType * pType )
: SvMetaAttribute( pType )
- , aCachable( TRUE, FALSE )
- , aSynchron( TRUE, FALSE )
- , aRecordPerSet( TRUE, FALSE )
- , aRecordAbsolute( FALSE, FALSE )
+ , aCachable( sal_True, sal_False )
+ , aSynchron( sal_True, sal_False )
+ , aRecordPerSet( sal_True, sal_False )
+ , aRecordAbsolute( sal_False, sal_False )
, pLinkedSlot(0)
, pNextSlot(0)
, pEnumValue(0)
@@ -73,7 +73,7 @@ void SvMetaSlot::Load( SvPersistStream & rStm )
{
SvMetaAttribute::Load( rStm );
- USHORT nMask;
+ sal_uInt16 nMask;
rStm >> nMask;
TEST_READ
@@ -171,7 +171,7 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
SvMetaAttribute::Save( rStm );
// create mask
- USHORT nMask = 0;
+ sal_uInt16 nMask = 0;
if( aMethod.Is() ) nMask |= 0x0001;
if( aGroupId.Len() ) nMask |= 0x0002;
if( aHasCoreId.IsSet() ) nMask |= 0x0004;
@@ -289,19 +289,19 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
if( nMask & 0x0002 ) rStm << aImageReflection;
}
-BOOL SvMetaSlot::IsVariable() const
+sal_Bool SvMetaSlot::IsVariable() const
{
return SvMetaAttribute::IsVariable();
}
-BOOL SvMetaSlot::IsMethod() const
+sal_Bool SvMetaSlot::IsMethod() const
{
- BOOL b = SvMetaAttribute::IsMethod();
+ sal_Bool b = SvMetaAttribute::IsMethod();
b |= NULL != GetMethod();
return b;
}
-ByteString SvMetaSlot::GetMangleName( BOOL bVariable ) const
+ByteString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
{
if( !bVariable )
{
@@ -329,7 +329,7 @@ SvMetaAttribute * SvMetaSlot::GetMethod() const
if( aMethod.Is() || !GetRef() ) return aMethod;
return ((SvMetaSlot *)GetRef())->GetMethod();
}
-BOOL SvMetaSlot::GetHasCoreId() const
+sal_Bool SvMetaSlot::GetHasCoreId() const
{
if( aHasCoreId.IsSet() || !GetRef() ) return aHasCoreId;
return ((SvMetaSlot *)GetRef())->GetHasCoreId();
@@ -364,50 +364,50 @@ const ByteString & SvMetaSlot::GetDefault() const
if( aDefault.Len() || !GetRef() ) return aDefault;
return ((SvMetaSlot *)GetRef())->GetDefault();
}
-BOOL SvMetaSlot::GetPseudoSlots() const
+sal_Bool SvMetaSlot::GetPseudoSlots() const
{
if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots;
return ((SvMetaSlot *)GetRef())->GetPseudoSlots();
}
-BOOL SvMetaSlot::GetCachable() const
+sal_Bool SvMetaSlot::GetCachable() const
{
// Cachable and Volatile are exclusive
if( !GetRef() || aCachable.IsSet() || aVolatile.IsSet() )
return aCachable;
return ((SvMetaSlot *)GetRef())->GetCachable();
}
-BOOL SvMetaSlot::GetVolatile() const
+sal_Bool SvMetaSlot::GetVolatile() const
{
// Cachable and Volatile are exclusive
if( !GetRef() || aVolatile.IsSet() || aCachable.IsSet() )
return aVolatile;
return ((SvMetaSlot *)GetRef())->GetVolatile();
}
-BOOL SvMetaSlot::GetToggle() const
+sal_Bool SvMetaSlot::GetToggle() const
{
if( aToggle.IsSet() || !GetRef() ) return aToggle;
return ((SvMetaSlot *)GetRef())->GetToggle();
}
-BOOL SvMetaSlot::GetAutoUpdate() const
+sal_Bool SvMetaSlot::GetAutoUpdate() const
{
if( aAutoUpdate.IsSet() || !GetRef() ) return aAutoUpdate;
return ((SvMetaSlot *)GetRef())->GetAutoUpdate();
}
-BOOL SvMetaSlot::GetSynchron() const
+sal_Bool SvMetaSlot::GetSynchron() const
{
// Synchron and Asynchron are exclusive
if( !GetRef() || aSynchron.IsSet() || aAsynchron.IsSet() )
return aSynchron;
return ((SvMetaSlot *)GetRef())->GetSynchron();
}
-BOOL SvMetaSlot::GetAsynchron() const
+sal_Bool SvMetaSlot::GetAsynchron() const
{
// Synchron and Asynchron are exclusive
if( !GetRef() || aAsynchron.IsSet() || aSynchron.IsSet() )
return aAsynchron;
return ((SvMetaSlot *)GetRef())->GetAsynchron();
}
-BOOL SvMetaSlot::GetRecordPerItem() const
+sal_Bool SvMetaSlot::GetRecordPerItem() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -415,7 +415,7 @@ BOOL SvMetaSlot::GetRecordPerItem() const
return aRecordPerItem;
return ((SvMetaSlot *)GetRef())->GetRecordPerItem();
}
-BOOL SvMetaSlot::GetRecordPerSet() const
+sal_Bool SvMetaSlot::GetRecordPerSet() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -423,7 +423,7 @@ BOOL SvMetaSlot::GetRecordPerSet() const
return aRecordPerSet;
return ((SvMetaSlot *)GetRef())->GetRecordPerSet();
}
-BOOL SvMetaSlot::GetRecordManual() const
+sal_Bool SvMetaSlot::GetRecordManual() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -431,7 +431,7 @@ BOOL SvMetaSlot::GetRecordManual() const
return aRecordManual;
return ((SvMetaSlot *)GetRef())->GetRecordManual();
}
-BOOL SvMetaSlot::GetNoRecord() const
+sal_Bool SvMetaSlot::GetNoRecord() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -439,13 +439,13 @@ BOOL SvMetaSlot::GetNoRecord() const
return aNoRecord;
return ((SvMetaSlot *)GetRef())->GetNoRecord();
}
-BOOL SvMetaSlot::GetRecordAbsolute() const
+sal_Bool SvMetaSlot::GetRecordAbsolute() const
{
if( !GetRef() || aRecordAbsolute.IsSet() )
return aRecordAbsolute;
return ((SvMetaSlot *)GetRef())->GetRecordAbsolute();
}
-BOOL SvMetaSlot::GetHasDialog() const
+sal_Bool SvMetaSlot::GetHasDialog() const
{
if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog;
return ((SvMetaSlot *)GetRef())->GetHasDialog();
@@ -455,44 +455,44 @@ const ByteString & SvMetaSlot::GetPseudoPrefix() const
if( aPseudoPrefix.Len() || !GetRef() ) return aPseudoPrefix;
return ((SvMetaSlot *)GetRef())->GetPseudoPrefix();
}
-BOOL SvMetaSlot::GetMenuConfig() const
+sal_Bool SvMetaSlot::GetMenuConfig() const
{
if( aMenuConfig.IsSet() || !GetRef() ) return aMenuConfig;
return ((SvMetaSlot *)GetRef())->GetMenuConfig();
}
-BOOL SvMetaSlot::GetToolBoxConfig() const
+sal_Bool SvMetaSlot::GetToolBoxConfig() const
{
if( aToolBoxConfig.IsSet() || !GetRef() ) return aToolBoxConfig;
return ((SvMetaSlot *)GetRef())->GetToolBoxConfig();
}
-BOOL SvMetaSlot::GetStatusBarConfig() const
+sal_Bool SvMetaSlot::GetStatusBarConfig() const
{
if( aStatusBarConfig.IsSet() || !GetRef() ) return aStatusBarConfig;
return ((SvMetaSlot *)GetRef())->GetStatusBarConfig();
}
-BOOL SvMetaSlot::GetAccelConfig() const
+sal_Bool SvMetaSlot::GetAccelConfig() const
{
if( aAccelConfig.IsSet() || !GetRef() ) return aAccelConfig;
return ((SvMetaSlot *)GetRef())->GetAccelConfig();
}
-BOOL SvMetaSlot::GetFastCall() const
+sal_Bool SvMetaSlot::GetFastCall() const
{
if( aFastCall.IsSet() || !GetRef() ) return aFastCall;
return ((SvMetaSlot *)GetRef())->GetFastCall();
}
-BOOL SvMetaSlot::GetContainer() const
+sal_Bool SvMetaSlot::GetContainer() const
{
if( aContainer.IsSet() || !GetRef() ) return aContainer;
return ((SvMetaSlot *)GetRef())->GetContainer();
}
-BOOL SvMetaSlot::GetImageRotation() const
+sal_Bool SvMetaSlot::GetImageRotation() const
{
if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation;
return ((SvMetaSlot *)GetRef())->GetImageRotation();
}
-BOOL SvMetaSlot::GetImageReflection() const
+sal_Bool SvMetaSlot::GetImageReflection() const
{
if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
return ((SvMetaSlot *)GetRef())->GetImageReflection();
@@ -510,7 +510,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
{
SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm );
- BOOL bOk = FALSE;
+ sal_Bool bOk = sal_False;
bOk |= aDefault.ReadSvIdl( SvHash_Default(), rInStm );
bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm );
bOk |= aHasCoreId.ReadSvIdl( SvHash_HasCoreId(), rInStm );
@@ -534,29 +534,29 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
}
if( aCachable.ReadSvIdl( SvHash_Cachable(), rInStm ) )
- SetCachable( aCachable ), bOk = TRUE;
+ SetCachable( aCachable ), bOk = sal_True;
if( aVolatile.ReadSvIdl( SvHash_Volatile(), rInStm ) )
- SetVolatile( aVolatile ), bOk = TRUE;
+ SetVolatile( aVolatile ), bOk = sal_True;
if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) )
- SetToggle( aToggle ), bOk = TRUE;
+ SetToggle( aToggle ), bOk = sal_True;
if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) )
- SetAutoUpdate( aAutoUpdate ), bOk = TRUE;
+ SetAutoUpdate( aAutoUpdate ), bOk = sal_True;
if( aSynchron.ReadSvIdl( SvHash_Synchron(), rInStm ) )
- SetSynchron( aSynchron ), bOk = TRUE;
+ SetSynchron( aSynchron ), bOk = sal_True;
if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) )
- SetAsynchron( aAsynchron ), bOk = TRUE;
+ SetAsynchron( aAsynchron ), bOk = sal_True;
if( aRecordAbsolute.ReadSvIdl( SvHash_RecordAbsolute(), rInStm ) )
- SetRecordAbsolute( aRecordAbsolute), bOk = TRUE;
+ SetRecordAbsolute( aRecordAbsolute), bOk = sal_True;
if( aRecordPerItem.ReadSvIdl( SvHash_RecordPerItem(), rInStm ) )
- SetRecordPerItem( aRecordPerItem ), bOk = TRUE;
+ SetRecordPerItem( aRecordPerItem ), bOk = sal_True;
if( aRecordPerSet.ReadSvIdl( SvHash_RecordPerSet(), rInStm ) )
- SetRecordPerSet( aRecordPerSet ), bOk = TRUE;
+ SetRecordPerSet( aRecordPerSet ), bOk = sal_True;
if( aRecordManual.ReadSvIdl( SvHash_RecordManual(), rInStm ) )
- SetRecordManual( aRecordManual ), bOk = TRUE;
+ SetRecordManual( aRecordManual ), bOk = sal_True;
if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) )
- SetNoRecord( aNoRecord ), bOk = TRUE;
+ SetNoRecord( aNoRecord ), bOk = sal_True;
bOk |= aHasDialog.ReadSvIdl( SvHash_HasDialog(), rInStm );
bOk |= aPseudoPrefix.ReadSvIdl( SvHash_PseudoPrefix(), rInStm );
@@ -567,7 +567,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvBOOL aAllConfig;
if( aAllConfig.ReadSvIdl( SvHash_AllConfig(), rInStm ) )
- SetAllConfig( aAllConfig ), bOk = TRUE;
+ SetAllConfig( aAllConfig ), bOk = sal_True;
bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
@@ -578,11 +578,11 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
{
if( !aSlotType.Is() )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( SvHash_SlotType() ) )
{
- BOOL bBraket = rInStm.Read( '(' );
+ sal_Bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
aSlotType = rBase.ReadKnownType( rInStm );
@@ -614,7 +614,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
if( pTok->IsIdentifier() )
{
aMethod = new SvMetaSlot();
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
if( aMethod->ReadSvIdl( rBase, rInStm ) )
{
if( aMethod->IsMethod() )
@@ -633,7 +633,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
SvMetaAttribute::WriteAttributesSvIdl( rBase, rOutStm, nTab );
@@ -807,9 +807,9 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
}
-BOOL SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
- BOOL bOk = SvMetaAttribute::Test( rBase, rInStm );
+ sal_Bool bOk = SvMetaAttribute::Test( rBase, rInStm );
if( bOk )
{
SvMetaType * pType = GetType();
@@ -819,17 +819,17 @@ BOOL SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
rBase.SetError( "this attribute is not a slot", rInStm.GetToken() );
rBase.WriteError( rInStm );
- bOk = FALSE;
+ bOk = sal_False;
}
}
return bOk;
}
-BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
- BOOL bOk = TRUE;
+ sal_uInt32 nTokPos = rInStm.Tell();
+ sal_Bool bOk = sal_True;
SvMetaAttribute * pAttr = rBase.ReadKnownAttr( rInStm, GetType() );
if( pAttr )
@@ -849,7 +849,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
aStr += " is method or variable but not a slot";
rBase.SetError( aStr, rInStm.GetToken() );
rBase.WriteError( rInStm );
- bOk = FALSE;
+ bOk = sal_False;
}
}
else
@@ -870,7 +870,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
OSL_FAIL("Illegal definition!");
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
SetName( pKnownSlot->GetName(), &rBase );
@@ -882,7 +882,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
aStr += " is method or variable but not a slot";
rBase.SetError( aStr, rInStm.GetToken() );
rBase.WriteError( rInStm );
- bOk = FALSE;
+ bOk = sal_False;
}
}
}
@@ -894,13 +894,13 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
void SvMetaSlot::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
SvMetaAttribute::WriteSvIdl( rBase, rOutStm, nTab );
}
void SvMetaSlot::Write( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
if ( nT == WRITE_DOCU )
@@ -935,10 +935,10 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
SvIdlDataBase& rBase)
{
// get insert position through binary search in slotlist
- USHORT nId = (USHORT) GetSlotId().GetValue();
- USHORT nListCount = (USHORT) rList.Count();
- USHORT nPos;
- ULONG m; // for inner "for" loop
+ sal_uInt16 nId = (sal_uInt16) GetSlotId().GetValue();
+ sal_uInt16 nListCount = (sal_uInt16) rList.Count();
+ sal_uInt16 nPos;
+ sal_uLong m; // for inner "for" loop
if ( !nListCount )
nPos = 0;
@@ -946,9 +946,9 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
nPos = rList.GetObject(0)->xSlot->GetSlotId().GetValue() >= nId ? 0 : 1;
else
{
- USHORT nMid = 0, nLow = 0;
- USHORT nHigh = nListCount - 1;
- BOOL bFound = FALSE;
+ sal_uInt16 nMid = 0, nLow = 0;
+ sal_uInt16 nHigh = nListCount - 1;
+ sal_Bool bFound = sal_False;
while ( !bFound && nLow <= nHigh )
{
nMid = (nLow + nHigh) >> 1;
@@ -967,7 +967,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
break;
}
else
- bFound = TRUE;
+ bFound = sal_True;
}
DBG_ASSERT(!bFound, "Duplicate SlotId!");
@@ -977,13 +977,13 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
DBG_ASSERT( nPos <= nListCount,
"nPos too large" );
DBG_ASSERT( nPos == nListCount || nId <=
- (USHORT) rList.GetObject(nPos)->xSlot->GetSlotId().GetValue(),
+ (sal_uInt16) rList.GetObject(nPos)->xSlot->GetSlotId().GetValue(),
"Successor has lower SlotId" );
DBG_ASSERT( nPos == 0 || nId >
- (USHORT) rList.GetObject(nPos-1)->xSlot->GetSlotId().GetValue(),
+ (sal_uInt16) rList.GetObject(nPos-1)->xSlot->GetSlotId().GetValue(),
"Predecessor has higher SlotId" );
DBG_ASSERT( nPos+1 >= nListCount || nId <
- (USHORT) rList.GetObject(nPos+1)->xSlot->GetSlotId().GetValue(),
+ (sal_uInt16) rList.GetObject(nPos+1)->xSlot->GetSlotId().GetValue(),
"Successor has lower SlotId" );
rList.Insert( new SvSlotElement( this, rPrefix ), nPos );
@@ -997,7 +997,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
// clone the MasterSlot
SvMetaSlotRef xEnumSlot;
SvMetaSlot *pFirstEnumSlot = NULL;
- for( ULONG n = 0; n < pEnum->Count(); n++ )
+ for( sal_uLong n = 0; n < pEnum->Count(); n++ )
{
// create SlotId
SvMetaEnumValue *enumValue = pEnum->GetObject(n);
@@ -1024,7 +1024,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
{
OSL_FAIL("Invalid EnumSlot!");
xEnumSlot = Clone();
- ULONG nValue;
+ sal_uLong nValue;
if ( rBase.FindId(aSId , &nValue) )
{
SvNumberIdentifier aId;
@@ -1035,7 +1035,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
}
// The slaves are no master!
- xEnumSlot->aPseudoSlots = FALSE;
+ xEnumSlot->aPseudoSlots = sal_False;
xEnumSlot->SetEnumValue(enumValue);
if ( !pFirstEnumSlot || xEnumSlot->GetSlotId().GetValue() < pFirstEnumSlot->GetSlotId().GetValue() )
@@ -1052,7 +1052,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
pLinkedSlot = pFirstEnumSlot;
// concatenate slaves among themselves
- rList.Seek((ULONG)0);
+ rList.Seek((sal_uLong)0);
xEnumSlot = pFirstEnumSlot;
SvSlotElement *pEle;
do
@@ -1087,12 +1087,12 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
ByteString aMethodName( GetExecMethod() );
if ( aMethodName.Len() && aMethodName != "NoExec" )
{
- BOOL bIn = FALSE;
+ sal_Bool bIn = sal_False;
for( size_t n = 0; n < rList.size(); n++ )
{
if( *(rList[ n ]) == aMethodName )
{
- bIn=TRUE;
+ bIn=sal_True;
break;
}
}
@@ -1111,12 +1111,12 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
aMethodName = GetStateMethod();
if ( aMethodName.Len() && aMethodName != "NoState" )
{
- BOOL bIn = FALSE;
+ sal_Bool bIn = sal_False;
for ( size_t n=0; n < rList.size(); n++ )
{
if ( *(rList[ n ]) == aMethodName )
{
- bIn=TRUE;
+ bIn=sal_True;
break;
}
}
@@ -1133,7 +1133,7 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
}
}
-void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
+void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
const ByteString & rSlotId,
SvSlotElementList& rSlotList,
const ByteString & rPrefix,
@@ -1142,7 +1142,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
if ( !GetExport() && !GetHidden() )
return;
- BOOL bIsEnumSlot = 0 != pEnumValue;
+ sal_Bool bIsEnumSlot = 0 != pEnumValue;
rOutStm << "// Slot Nr. " << ByteString::CreateFromInt32(nListPos).GetBuffer() << " : ";
ByteString aSlotIdValue( ByteString::CreateFromInt32( GetSlotId().GetValue() ) );
@@ -1353,7 +1353,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
pType = pMethod->GetType();
else
pType = GetType();
- ULONG nSCount = pType->GetAttrCount();
+ sal_uLong nSCount = pType->GetAttrCount();
rOutStm << ByteString::CreateFromInt32( nSCount ).GetBuffer() << "/*Count*/";
}
else
@@ -1368,7 +1368,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
rOutStm << '.';
if ( !IsVariable() || !GetType() ||
GetType()->GetBaseType()->GetType() != TYPE_STRUCT )
- rOutStm << GetMangleName( FALSE ).GetBuffer();
+ rOutStm << GetMangleName( sal_False ).GetBuffer();
rOutStm << "\",";
}
else
@@ -1389,14 +1389,14 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
{
rOutStm << ",\"";
- rOutStm << GetMangleName( FALSE ).GetBuffer();
+ rOutStm << GetMangleName( sal_False ).GetBuffer();
rOutStm << "\"";
}
rOutStm << " )," << endl;
}
-USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm )
+sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm )
{
if ( !GetExport() && !GetHidden() )
return 0;
@@ -1415,7 +1415,7 @@ USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutSt
const SvMetaAttributeMemberList & rList =
pType->GetAttrList();
- for( ULONG n = 0; n < rList.Count(); n++ )
+ for( sal_uLong n = 0; n < rList.Count(); n++ )
{
SvMetaAttribute * pPar = rList.GetObject( n );
SvMetaType * pPType = pPar->GetType();
@@ -1429,12 +1429,12 @@ USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutSt
if( !rBase.FindType( pPType, rBase.aUsedTypes ) )
rBase.aUsedTypes.Append( pPType );
}
- return (USHORT)rList.Count();
+ return (sal_uInt16)rList.Count();
}
return 0;
}
-USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
+sal_uInt16 SvMetaSlot::WriteSlotMap( const ByteString & rShellName, sal_uInt16 nCount,
SvSlotElementList& rSlotList,
const ByteString & rPrefix,
SvIdlDataBase & rBase,
@@ -1443,7 +1443,7 @@ USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
// SlotId, if not specified generate from name
ByteString slotId = GetSlotId();
- USHORT nSCount = 0;
+ sal_uInt16 nSCount = 0;
if( IsMethod() )
{
SvMetaType * pType;
@@ -1453,7 +1453,7 @@ USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
else
pType = GetType();
- nSCount = (USHORT)pType->GetAttrCount();
+ nSCount = (sal_uInt16)pType->GetAttrCount();
}
WriteSlot( rShellName, nCount, slotId, rSlotList, rPrefix, rBase, rOutStm );
@@ -1466,7 +1466,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
if (!GetToolBoxConfig() && !GetAccelConfig() && !GetMenuConfig() && !GetStatusBarConfig() )
return;
- ULONG nSId = GetSlotId().GetValue();
+ sal_uLong nSId = GetSlotId().GetValue();
if( !pTable->IsKeyValid( nSId ) )
{
pTable->Insert( nSId, this );
@@ -1493,7 +1493,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
if( GetPseudoSlots() && pEnum )
{
- for( ULONG n = 0; n < pEnum->Count(); n++ )
+ for( sal_uLong n = 0; n < pEnum->Count(); n++ )
{
ByteString aValName = pEnum->GetObject( n )->GetName();
ByteString aSId( GetSlotId() );
@@ -1502,12 +1502,12 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
aSId += '_';
aSId += aValName.Copy( pEnum->GetPrefix().Len() );
- ULONG nSId2;
- BOOL bIdOk = FALSE;
+ sal_uLong nSId2;
+ sal_Bool bIdOk = sal_False;
if( rBase.FindId( aSId, &nSId2 ) )
{
aSId = ByteString::CreateFromInt32( nSId2 );
- bIdOk = TRUE;
+ bIdOk = sal_True;
}
// if id not found, write always
@@ -1535,7 +1535,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pTable )
{
- ULONG nSId = GetSlotId().GetValue();
+ sal_uLong nSId = GetSlotId().GetValue();
if( !pTable->IsKeyValid( nSId ) )
{
pTable->Insert( nSId, this );
@@ -1545,7 +1545,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
if( GetPseudoSlots() && pEnum )
{
- for( ULONG n = 0; n < pEnum->Count(); n++ )
+ for( sal_uLong n = 0; n < pEnum->Count(); n++ )
{
ByteString aValName = pEnum->GetObject( n )->GetName();
ByteString aSId( GetSlotId() );
@@ -1554,12 +1554,12 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
aSId += '_';
aSId += aValName.Copy( pEnum->GetPrefix().Len() );
- ULONG nSId2;
- BOOL bIdOk = FALSE;
+ sal_uLong nSId2;
+ sal_Bool bIdOk = sal_False;
if( rBase.FindId( aSId, &nSId2 ) )
{
aSId = ByteString::CreateFromInt32( nSId2 );
- bIdOk = TRUE;
+ bIdOk = sal_True;
}
// if id not found, write always
@@ -1574,12 +1574,12 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-void WriteBool( BOOL bSet, SvStream& rStream )
+void WriteBool( sal_Bool bSet, SvStream& rStream )
{
if ( bSet )
- rStream << "TRUE" << ',';
+ rStream << "sal_True" << ',';
else
- rStream << "FALSE" << ',';
+ rStream << "sal_False" << ',';
}
void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 510f0eed7a..e8ad7d2f31 100644..100755
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -40,23 +40,23 @@
SV_IMPL_META_FACTORY1( SvMetaAttribute, SvMetaReference );
SvMetaAttribute::SvMetaAttribute()
- : aAutomation( TRUE, FALSE )
- , aExport( TRUE, FALSE )
- , aIsCollection ( FALSE, FALSE )
- , aReadOnlyDoc ( TRUE, FALSE )
- , aHidden( FALSE, FALSE )
- , bNewAttr( FALSE )
+ : 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 )
{
}
SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
: aType( pType )
- , aAutomation( TRUE, FALSE )
- , aExport( TRUE, FALSE )
- , aIsCollection ( FALSE, FALSE)
- , aReadOnlyDoc ( TRUE, FALSE)
- , aHidden( FALSE, FALSE )
- , bNewAttr( FALSE )
+ , 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 )
{
}
@@ -64,7 +64,7 @@ void SvMetaAttribute::Load( SvPersistStream & rStm )
{
SvMetaReference::Load( rStm );
- BYTE nMask;
+ sal_uInt8 nMask;
rStm >> nMask;
if( nMask & 0x01 )
{
@@ -86,7 +86,7 @@ void SvMetaAttribute::Save( SvPersistStream & rStm )
SvMetaReference::Save( rStm );
// create mask
- BYTE nMask = 0;
+ sal_uInt8 nMask = 0;
if( aType.Is() ) nMask |= 0x1;
if( aSlotId.IsSet() ) nMask |= 0x2;
if( aExport.IsSet() ) nMask |= 0x4;
@@ -120,19 +120,19 @@ const SvNumberIdentifier & SvMetaAttribute::GetSlotId() const
return ((SvMetaAttribute *)GetRef())->GetSlotId();
}
-BOOL SvMetaAttribute::GetReadonly() const
+sal_Bool SvMetaAttribute::GetReadonly() const
{
if( aReadonly.IsSet() || !GetRef() ) return aReadonly;
return ((SvMetaAttribute *)GetRef())->GetReadonly();
}
-BOOL SvMetaAttribute::GetExport() const
+sal_Bool SvMetaAttribute::GetExport() const
{
if( aExport.IsSet() || !GetRef() ) return aExport;
return ((SvMetaAttribute *)GetRef())->GetExport();
}
-BOOL SvMetaAttribute::GetHidden() const
+sal_Bool SvMetaAttribute::GetHidden() const
{
// when export is set, but hidden is not the default is used
if ( aExport.IsSet() && !aHidden.IsSet() )
@@ -143,15 +143,15 @@ BOOL SvMetaAttribute::GetHidden() const
return ((SvMetaAttribute *)GetRef())->GetHidden();
}
-BOOL SvMetaAttribute::GetAutomation() const
+sal_Bool SvMetaAttribute::GetAutomation() const
{
if( aAutomation.IsSet() || !GetRef() ) return aAutomation;
return ((SvMetaAttribute *)GetRef())->GetAutomation();
}
-BOOL SvMetaAttribute::GetIsCollection() const
+sal_Bool SvMetaAttribute::GetIsCollection() const
{
- BOOL bRet;
+ sal_Bool bRet;
if( aIsCollection.IsSet() || !GetRef() )
{
if ( aIsCollection.IsSet() )
@@ -166,58 +166,58 @@ BOOL SvMetaAttribute::GetIsCollection() const
return ((SvMetaSlot *)GetRef())->GetIsCollection();
}
-BOOL SvMetaAttribute::GetReadOnlyDoc() const
+sal_Bool SvMetaAttribute::GetReadOnlyDoc() const
{
if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc;
return ((SvMetaSlot *)GetRef())->GetReadOnlyDoc();
}
-BOOL SvMetaAttribute::IsMethod() const
+sal_Bool SvMetaAttribute::IsMethod() const
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
return pType->GetType() == TYPE_METHOD;
}
-BOOL SvMetaAttribute::IsVariable() const
+sal_Bool SvMetaAttribute::IsVariable() const
{
SvMetaType * pType = GetType();
return pType->GetType() != TYPE_METHOD;
}
-ByteString SvMetaAttribute::GetMangleName( BOOL ) const
+ByteString SvMetaAttribute::GetMangleName( sal_Bool ) const
{
return GetName();
}
#ifdef IDL_COMPILER
-BOOL SvMetaAttribute::Test( SvIdlDataBase & rBase,
+sal_Bool SvMetaAttribute::Test( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
if( GetType()->IsItem() && !GetSlotId().IsSet() )
{
rBase.SetError( "slot without id declared", rInStm.GetToken() );
rBase.WriteError( rInStm );
- bOk = FALSE;
+ bOk = sal_False;
}
return bOk;
}
-BOOL SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
if( !GetType() )
// no type in ctor passed on
aType = rBase.ReadKnownType( rInStm );
- BOOL bOk = FALSE;
+ sal_Bool bOk = sal_False;
if( GetType() )
{
ReadNameSvIdl( rBase, rInStm );
aSlotId.ReadSvIdl( rBase, rInStm );
- bOk = TRUE;
+ bOk = sal_True;
SvToken * pTok = rInStm.GetToken();
if( bOk && pTok->IsChar() && pTok->GetChar() == '(' )
{
@@ -241,7 +241,7 @@ void SvMetaAttribute::WriteSvIdl
(
SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab
+ sal_uInt16 nTab
)
{
SvMetaType * pType = GetType();
@@ -251,7 +251,7 @@ void SvMetaAttribute::WriteSvIdl
rOutStm << ' ' << aSlotId.GetBuffer();
if( pType->GetType() == TYPE_METHOD )
pType->WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
- ULONG nPos = rOutStm.Tell();
+ sal_uLong nPos = rOutStm.Tell();
rOutStm << endl;
SvMetaName::WriteSvIdl( rBase, rOutStm, nTab );
TestAndSeekSpaceOnly( rOutStm, nPos );
@@ -282,7 +282,7 @@ void SvMetaAttribute::WriteAttributesSvIdl
(
SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab
+ sal_uInt16 nTab
)
{
SvMetaReference::WriteAttributesSvIdl( rBase, rOutStm, nTab );
@@ -332,7 +332,7 @@ void SvMetaAttribute::WriteAttributesSvIdl
void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT )
{
SvMetaType * pType = GetType();
@@ -346,8 +346,8 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
if( pBaseType->GetType() == TYPE_STRUCT )
{
const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
- ULONG nCount = rList.Count();
- for( ULONG i = 0; i < nCount; i++ )
+ sal_uLong nCount = rList.Count();
+ for( sal_uLong i = 0; i < nCount; i++ )
{
rList.GetObject( i )->WriteParam( rBase, rOutStm, nTab, nT );
if( i+1<nCount )
@@ -385,10 +385,10 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
}
}
-ULONG SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, BOOL bVar ) const
+sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const
{
const SvNumberIdentifier & rId = GetSlotId();
- ULONG n = rId.GetValue();
+ sal_uLong n = rId.GetValue();
if( rBase.aStructSlotId.Len() )
{
n = n << 20;
@@ -404,20 +404,20 @@ ULONG SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, BOOL bVar ) const
}
void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
if( nT == WRITE_ODL )
{
const SvNumberIdentifier & rId = GetSlotId();
- BOOL bReadonly = GetReadonly() || ( nA & WA_READONLY );
+ sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
if( (rId.IsSet() && !(nA & WA_STRUCT)) || bReadonly )
{
- BOOL bVar = IsVariable();
+ sal_Bool bVar = IsVariable();
if( nA & WA_VARIABLE )
- bVar = TRUE;
+ bVar = sal_True;
else if( nA & WA_METHOD )
- bVar = FALSE;
+ bVar = sal_False;
WriteTab( rOutStm, nTab );
rOutStm << "//class SvMetaAttribute" << endl;
@@ -438,14 +438,14 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
}
void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
- BOOL bSet )
+ sal_Bool bSet )
{
rOutStm << endl;
SvMetaType * pType = GetType();
SvMetaType * pBaseType = pType->GetBaseType();
// for Set the return is always void
- BOOL bVoid = bSet;
+ sal_Bool bVoid = bSet;
if( pBaseType->GetType() == TYPE_METHOD )
bVoid = pBaseType->GetReturnType()->GetBaseType()->GetName() == "void";
@@ -513,11 +513,11 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
}
void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
const SvMetaAttributeMemberList & rList = GetType()->GetBaseType()->GetAttrList();
- ULONG nCount = rList.Count();
+ sal_uLong nCount = rList.Count();
SvNumberIdentifier slotId = rBase.aStructSlotId;
if ( GetSlotId().Len() )
@@ -527,7 +527,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
if ( GetReadonly() )
nA |= WA_READONLY;
- for( ULONG i = 0; i < nCount; i++ )
+ for( sal_uLong i = 0; i < nCount; i++ )
{
SvMetaAttribute *pAttr = rList.GetObject( i );
if ( nT == WRITE_DOCU )
@@ -541,7 +541,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
}
void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
// no attributes for automation
@@ -553,11 +553,11 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
else if ( !GetAutomation() || !GetExport() )
return;
- BOOL bVariable;
+ sal_Bool bVariable;
if( nA & WA_VARIABLE )
- bVariable = TRUE;
+ bVariable = sal_True;
else if( nA & WA_METHOD )
- bVariable = FALSE;
+ bVariable = sal_False;
else
bVariable = IsVariable();
@@ -604,7 +604,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( nT == WRITE_C_HEADER )
rOutStm << ';' << endl << endl;
else
- WriteCSource( rBase, rOutStm, FALSE );
+ WriteCSource( rBase, rOutStm, sal_False );
}
else if ( bVariable && IsVariable() )
{
@@ -619,7 +619,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
ByteString name = GetName();
- BOOL bReadonly = GetReadonly() || ( nA & WA_READONLY );
+ sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
if ( !bReadonly && !IsMethod() )
{
// allocation
@@ -634,7 +634,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( nT == WRITE_C_HEADER )
rOutStm << ';' << endl << endl;
else
- WriteCSource( rBase, rOutStm, TRUE );
+ WriteCSource( rBase, rOutStm, sal_True );
}
// access
@@ -647,7 +647,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( nT == WRITE_C_HEADER )
rOutStm << ';' << endl << endl;
else
- WriteCSource( rBase, rOutStm, FALSE );
+ WriteCSource( rBase, rOutStm, sal_False );
}
}
}
@@ -722,7 +722,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-ULONG SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
@@ -757,13 +757,13 @@ void SvMetaAttribute::WriteHelpId( SvIdlDataBase &, SvStream &, Table * )
SV_IMPL_META_FACTORY1( SvMetaType, SvMetaExtern );
#define CTOR \
- : aCall0( CALL_VALUE, FALSE ) \
- , aCall1( CALL_VALUE, FALSE ) \
- , aSbxDataType( 0, FALSE ) \
+ : aCall0( CALL_VALUE, sal_False ) \
+ , aCall1( CALL_VALUE, sal_False ) \
+ , aSbxDataType( 0, sal_False ) \
, pAttrList( NULL ) \
, nType( TYPE_BASE ) \
- , bIsItem( FALSE ) \
- , bIsShell( FALSE ) \
+ , bIsItem( sal_False ) \
+ , bIsShell( sal_False ) \
, cParserChar( 'h' )
SvMetaType::SvMetaType()
@@ -802,7 +802,7 @@ void SvMetaType::Load( SvPersistStream & rStm )
{
SvMetaExtern::Load( rStm );
- USHORT nMask;
+ sal_uInt16 nMask;
rStm >> nMask;
if( nMask & 0x0001 ) rStm >> aIn;
if( nMask & 0x0002 ) rStm >> aOut;
@@ -813,11 +813,11 @@ void SvMetaType::Load( SvPersistStream & rStm )
if( nMask & 0x0040 ) rStm >> aSbxName;
if( nMask & 0x0080 ) rStm >> aOdlName;
if( nMask & 0x0100 ) rStm >> GetAttrList();
- if( nMask & 0x0200 ) bIsItem = TRUE;
- if( nMask & 0x0400 ) bIsShell = TRUE;
+ if( nMask & 0x0200 ) bIsItem = sal_True;
+ if( nMask & 0x0400 ) bIsShell = sal_True;
if( nMask & 0x0800 )
{
- USHORT nT;
+ sal_uInt16 nT;
rStm >> nT;
nType = nT;
}
@@ -832,7 +832,7 @@ void SvMetaType::Save( SvPersistStream & rStm )
SvMetaExtern::Save( rStm );
// create mask
- USHORT nMask = 0;
+ sal_uInt16 nMask = 0;
if( aIn.IsSet() ) nMask |= 0x0001;
if( aOut.IsSet() ) nMask |= 0x0002;
if( aCall0.IsSet() ) nMask |= 0x0004;
@@ -861,7 +861,7 @@ void SvMetaType::Save( SvPersistStream & rStm )
if( nMask & 0x0040 ) rStm << aSbxName;
if( nMask & 0x0080 ) rStm << aOdlName;
if( nMask & 0x0100 ) rStm << *pAttrList;
- if( nMask & 0x0800 ) rStm << (USHORT)nType;
+ if( nMask & 0x0800 ) rStm << (sal_uInt16)nType;
if( nMask & 0x1000 ) rStm << cParserChar;
if( nMask & 0x2000 ) rStm << aCName;
if( nMask & 0x4000 ) rStm << aBasicName;
@@ -926,7 +926,7 @@ ByteString SvMetaType::GetBasicPostfix() const
return aRet;
}
-BOOL SvMetaType::GetIn() const
+sal_Bool SvMetaType::GetIn() const
{
if( aIn.IsSet() || !GetRef() )
return aIn;
@@ -934,7 +934,7 @@ BOOL SvMetaType::GetIn() const
return ((SvMetaType *)GetRef())->GetIn();
}
-BOOL SvMetaType::GetOut() const
+sal_Bool SvMetaType::GetOut() const
{
if( aOut.IsSet() || !GetRef() )
return aOut;
@@ -1022,7 +1022,7 @@ const ByteString & SvMetaType::GetCName() const
return ((SvMetaType *)GetRef())->GetCName();
}
-BOOL SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
{
aSvName = rName;
aSbxName = rName;
@@ -1047,18 +1047,18 @@ ByteString SvMetaType::GetCString() const
return out;
}
-BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- BOOL bOk = FALSE;
- UINT32 nTokPos = rInStm.Tell();
+ sal_Bool bOk = sal_False;
+ sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( SvHash_interface() )
|| pTok->Is( SvHash_shell() ) )
{
if( pTok->Is( SvHash_shell() ) )
- bIsShell = TRUE;
+ bIsShell = sal_True;
SetType( TYPE_CLASS );
bOk = ReadNamesSvIdl( rBase, rInStm );
@@ -1072,7 +1072,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
{
SetType( TYPE_UNION );
if( ReadNameSvIdl( rBase, rInStm ) )
- return TRUE;
+ return sal_True;
}
else if( pTok->Is( SvHash_enum() ) )
{
@@ -1083,7 +1083,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
|| pTok->Is( SvHash_item() ) )
{
if( pTok->Is( SvHash_item() ) )
- bIsItem = TRUE;
+ bIsItem = sal_True;
SvMetaType * pType = rBase.ReadKnownType( rInStm );
if( pType )
@@ -1097,12 +1097,12 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
if( rInStm.Read( ')' ) )
{
SetType( TYPE_METHOD );
- bOk = TRUE;
+ bOk = sal_True;
}
}
else
{
- bOk = TRUE;
+ bOk = sal_True;
}
}
}
@@ -1120,7 +1120,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
return bOk;
}
-BOOL SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
if( ReadHeaderSvIdl( rBase, rInStm ) )
@@ -1128,21 +1128,21 @@ BOOL SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
rBase.Write( '.' );
return SvMetaExtern::ReadSvIdl( rBase, rInStm );
}
- return FALSE;
+ return sal_False;
}
void SvMetaType::WriteSvIdl
(
SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab
+ sal_uInt16 nTab
)
{
WriteHeaderSvIdl( rBase, rOutStm, nTab );
if( GetType() == TYPE_METHOD )
WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
- ULONG nOldPos = rOutStm.Tell();
+ sal_uLong nOldPos = rOutStm.Tell();
rOutStm << endl;
SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab );
if( TestAndSeekSpaceOnly( rOutStm, nOldPos ) )
@@ -1152,7 +1152,7 @@ void SvMetaType::WriteSvIdl
}
void SvMetaType::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
if( GetAttrCount() )
@@ -1171,7 +1171,7 @@ void SvMetaType::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
}
void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
if( nT == WRITE_C_HEADER && nType != TYPE_ENUM )
@@ -1250,17 +1250,17 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-BOOL SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- BOOL bOk = ReadNameSvIdl( rBase, rInStm );
+ sal_Bool bOk = ReadNameSvIdl( rBase, rInStm );
return bOk;
}
void SvMetaType::WriteHeaderSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
switch( nType )
{
@@ -1329,7 +1329,7 @@ void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase,
void SvMetaType::WriteAttributesSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
ByteString name = GetName();
@@ -1373,7 +1373,7 @@ void SvMetaType::WriteContextSvIdl
(
SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab
+ sal_uInt16 nTab
)
{
if( GetAttrCount() )
@@ -1393,21 +1393,21 @@ void SvMetaType::WriteContextSvIdl
}
void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
}
-ULONG SvMetaType::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray )
{
- ULONG nC = 0;
+ sal_uLong nC = 0;
if( GetBaseType()->GetType() == TYPE_STRUCT )
{
- ULONG nAttrCount = GetAttrCount();
+ sal_uLong nAttrCount = GetAttrCount();
// write the single attributes
- for( ULONG n = 0; n < nAttrCount; n++ )
+ for( sal_uLong n = 0; n < nAttrCount; n++ )
{
nC += pAttrList->GetObject( n )->MakeSfx( pAttrArray );
if( n +1 < nAttrCount )
@@ -1427,7 +1427,7 @@ void SvMetaType::WriteSfxItem(
ByteString aTypeName = "SfxType";
ByteString aAttrArray;
- ULONG nAttrCount = MakeSfx( &aAttrArray );
+ sal_uLong nAttrCount = MakeSfx( &aAttrArray );
ByteString aAttrCount( ByteString::CreateFromInt32( nAttrCount ) );
aTypeName += aAttrCount;
@@ -1463,28 +1463,28 @@ void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
}
}
-BOOL SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
if( rInStm.Read( '(' ) )
{
DoReadContextSvIdl( rBase, rInStm );
if( rInStm.Read( ')' ) )
{
SetType( TYPE_METHOD );
- return TRUE;
+ return sal_True;
}
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
void SvMetaType::WriteMethodArgs
(
SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab, WriteType nT
+ sal_uInt16 nTab, WriteType nT
)
{
if( nT == WRITE_IDL )
@@ -1560,7 +1560,7 @@ void SvMetaType::WriteMethodArgs
default:
{
- DBG_ASSERT( FALSE, "WriteType not implemented" );
+ DBG_ASSERT( sal_False, "WriteType not implemented" );
}
}
pAttr = pAttrList->Next();
@@ -1579,7 +1579,7 @@ void SvMetaType::WriteMethodArgs
}
void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab, WriteType nT )
+ sal_uInt16 nTab, WriteType nT )
{
switch( nT )
{
@@ -1597,8 +1597,8 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
case WRITE_ODL:
{
- BOOL bIn = GetIn();
- BOOL bOut = GetOut();
+ sal_Bool bIn = GetIn();
+ sal_Bool bOut = GetOut();
if( bIn || bOut )
{
if( bIn && bOut )
@@ -1685,13 +1685,13 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
default:
{
- DBG_ASSERT( FALSE, "WriteType not implemented" );
+ DBG_ASSERT( sal_False, "WriteType not implemented" );
}
}
}
void SvMetaType::WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab, WriteType nT )
+ sal_uInt16 nTab, WriteType nT )
{
WriteTypePrefix( rBase, rOutStm, nTab, nT );
if( GetType() == TYPE_METHOD )
@@ -1709,9 +1709,9 @@ ByteString SvMetaType::GetParserString() const
if( TYPE_METHOD == type || TYPE_STRUCT == type )
{
- ULONG nAttrCount = GetAttrCount();
+ sal_uLong nAttrCount = GetAttrCount();
// write the single attributes
- for( ULONG n = 0; n < nAttrCount; n++ )
+ for( sal_uLong n = 0; n < nAttrCount; n++ )
{
SvMetaAttribute * pT = pAttrList->GetObject( n );
aPStr += pT->GetType()->GetParserString();
@@ -1736,9 +1736,9 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
if( TYPE_METHOD == type || TYPE_STRUCT == type )
{
- ULONG nAttrCount = GetAttrCount();
+ sal_uLong nAttrCount = GetAttrCount();
// write the single attributes
- for( ULONG n = 0; n < nAttrCount; n++ )
+ for( sal_uLong n = 0; n < nAttrCount; n++ )
{
SvMetaAttribute * pA = pAttrList->GetObject( n );
ByteString aStr = pA->GetName();
@@ -1779,7 +1779,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm )
{
SvMetaName::Load( rStm );
- BYTE nMask;
+ sal_uInt8 nMask;
rStm >> nMask;
if( nMask >= 0x02 )
{
@@ -1795,7 +1795,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
SvMetaName::Save( rStm );
// create mask
- BYTE nMask = 0;
+ sal_uInt8 nMask = 0;
if( aEnumValue.Len() ) nMask |= 0x01;
// write data
@@ -1804,20 +1804,20 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
}
#ifdef IDL_COMPILER
-BOOL SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
if( !ReadNameSvIdl( rBase, rInStm ) )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
-void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
{
rOutStm << GetName().GetBuffer();
}
-void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, USHORT,
+void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16,
WriteType nT, WriteAttribute )
{
if ( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE )
@@ -1837,7 +1837,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm )
{
SvMetaType::Load( rStm );
- BYTE nMask;
+ sal_uInt8 nMask;
rStm >> nMask;
if( nMask >= 0x04 )
{
@@ -1854,7 +1854,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
SvMetaType::Save( rStm );
// create mask
- BYTE nMask = 0;
+ sal_uInt8 nMask = 0;
if( aEnumValueList.Count() ) nMask |= 0x01;
if( aPrefix.Len() ) nMask |= 0x02;
@@ -1868,10 +1868,10 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue();
- BOOL bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
+ sal_Bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
if( bOk )
{
if( 0 == aEnumValueList.Count() )
@@ -1879,7 +1879,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
aPrefix = aEnumVal->GetName();
else
{
- USHORT nPos = aPrefix.Match( aEnumVal->GetName() );
+ sal_uInt16 nPos = aPrefix.Match( aEnumVal->GetName() );
if( nPos != aPrefix.Len() && nPos != STRING_MATCH )
aPrefix.Erase( nPos );
}
@@ -1891,10 +1891,10 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
WriteTab( rOutStm, nTab +1 );
- for( ULONG n = 0; n < aEnumValueList.Count(); n++ )
+ for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
{
aEnumValueList.GetObject( n )->WriteSvIdl( rBase, rOutStm, nTab );
if( n +1 != aEnumValueList.Count() )
@@ -1904,22 +1904,22 @@ void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
}
}
-BOOL SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- UINT32 nTokPos = rInStm.Tell();
+ sal_uInt32 nTokPos = rInStm.Tell();
if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm )
&& GetType() == TYPE_ENUM )
{
if( SvMetaName::ReadSvIdl( rBase, rInStm ) )
- return TRUE;
+ return sal_True;
}
rInStm.Seek( nTokPos );
- return FALSE;
+ return sal_False;
}
void SvMetaTypeEnum::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab )
+ sal_uInt16 nTab )
{
WriteHeaderSvIdl( rBase, rOutStm, nTab );
rOutStm << endl;
@@ -1928,18 +1928,18 @@ void SvMetaTypeEnum::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
}
void SvMetaTypeEnum::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
SvMetaType::Write( rBase, rOutStm, nTab, nT, nA );
}
void SvMetaTypeEnum::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
WriteTab( rOutStm, nTab +1 );
- for( ULONG n = 0; n < aEnumValueList.Count(); n++ )
+ for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
{
aEnumValueList.GetObject( n )->Write( rBase, rOutStm, nTab +1, nT, nA );
@@ -1994,7 +1994,7 @@ ByteString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
if ( aType->GetAttrCount() )
{
- ULONG nCount = aType->GetAttrCount();
+ sal_uLong nCount = aType->GetAttrCount();
SvMetaAttributeMemberList& rList = aType->GetAttrList();
SvMetaAttributeMemberList& rOtherList = pAttr->GetType()->GetAttrList();
if ( pAttr->GetType()->GetAttrCount() != nCount )
@@ -2003,7 +2003,7 @@ ByteString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
}
else
{
- for ( USHORT n=0; n<nCount; n++ )
+ for ( sal_uInt16 n=0; n<nCount; n++ )
{
SvMetaAttribute *pAttr1 = rList.GetObject(n);
SvMetaAttribute *pAttr2 = rOtherList.GetObject(n);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 11:56:17 +0000