summaryrefslogtreecommitdiff
path: root/idl/source
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-01-13 09:32:03 +0100
committerCarsten Driesner <cd@openoffice.org>2011-01-13 09:32:03 +0100
commit491e0010689b6f0da5f032725e7162bc6bc683db (patch)
treed79c6161a7b80b408bc270396015e5bd97b9ddc7 /idl/source
parent41ed3887616580fe2e900aaa2cac4edb4ce12f7d (diff)
removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in idl
Diffstat (limited to 'idl/source')
-rwxr-xr-xidl/source/cmptools/char.cxx4
-rwxr-xr-xidl/source/cmptools/hash.cxx6
-rwxr-xr-xidl/source/cmptools/lex.cxx8
-rwxr-xr-xidl/source/objects/basobj.cxx16
-rwxr-xr-xidl/source/objects/bastype.cxx10
-rwxr-xr-xidl/source/objects/module.cxx32
-rwxr-xr-xidl/source/objects/object.cxx32
-rwxr-xr-xidl/source/objects/slot.cxx24
-rwxr-xr-xidl/source/objects/types.cxx58
-rwxr-xr-xidl/source/prj/command.cxx2
-rwxr-xr-xidl/source/prj/database.cxx44
-rwxr-xr-xidl/source/prj/svidl.cxx4
12 files changed, 120 insertions, 120 deletions
diff --git a/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx
index 04a9b9eb38..884fbbbbc9 100755
--- a/idl/source/cmptools/char.cxx
+++ b/idl/source/cmptools/char.cxx
@@ -88,7 +88,7 @@ char * SvChar::GetTable( CharSet nSource , CharSet nDest )
pCharTable = new Table();
sal_uInt8 * pSet;
- pSet = (sal_uInt8 *)pCharTable->Get( ((sal_uIntPtr)nSource << 16) + (sal_uIntPtr)nDest );
+ pSet = (sal_uInt8 *)pCharTable->Get( ((sal_uLong)nSource << 16) + (sal_uLong)nDest );
if( !pSet )
{
@@ -100,7 +100,7 @@ char * SvChar::GetTable( CharSet nSource , CharSet nDest )
if( c )
pSet[ i ] = (sal_uInt8)c;
}
- pCharTable->Insert( ((sal_uIntPtr)nSource << 16) + (sal_uIntPtr)nDest, pSet );
+ pCharTable->Insert( ((sal_uLong)nSource << 16) + (sal_uLong)nDest, pSet );
}
return (char *)pSet;
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 3aeddec3e4..dd25082ec4 100755
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <ctype.h>
-// Programmabh„ngige Includes.
+// Programmabh�ngige Includes.
#include <hash.hxx>
#include <tools/debug.hxx>
@@ -73,8 +73,8 @@ SvHashTable::SvHashTable( sal_uInt32 nMaxEntries )
SvHashTable::~SvHashTable()
{
#ifdef DOS_NIE
- printf( "Maximum: %ld, Fllung: %ld\n", (sal_uIntPtr)nMax, (sal_uIntPtr)nFill );
- printf( "Anfragen: %ld, Versuche: %ld", (sal_uIntPtr)lAsk, (sal_uIntPtr)lTry );
+ printf( "Maximum: %ld, F�llung: %ld\n", (sal_uLong)nMax, (sal_uLong)nFill );
+ printf( "Anfragen: %ld, Versuche: %ld", (sal_uLong)lAsk, (sal_uLong)lTry );
if( lTry != 0 )
printf( ", V/E = %ld\n", lTry / lAsk );
#endif
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 7daab4e134..b7b26c1283 100755
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -284,9 +284,9 @@ int SvTokenStream::GetNextChar()
|*
|* Beschreibung
*************************************************************************/
-sal_uIntPtr SvTokenStream::GetNumber()
+sal_uLong SvTokenStream::GetNumber()
{
- sal_uIntPtr l = 0;
+ sal_uLong l = 0;
short nLog = 10;
if( '0' == c )
@@ -345,8 +345,8 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
}
while( 0 == c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
- sal_uIntPtr nLastLine = nLine;
- sal_uIntPtr nLastColumn = nColumn;
+ sal_uLong nLastLine = nLine;
+ sal_uLong nLastColumn = nColumn;
// Kommentar
if( '/' == c )
{
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index a5f840b0f9..a2db6bfca8 100755
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -89,10 +89,10 @@ void SvMetaObject::WriteStars( SvStream & rOutStm )
|*
|* Beschreibung
*************************************************************************/
-sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uIntPtr nBegPos )
+sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
{
// keine leeren Klammern schreiben
- sal_uIntPtr nPos = rOutStm.Tell();
+ sal_uLong nPos = rOutStm.Tell();
rOutStm.Seek( nBegPos );
sal_Bool bOnlySpace = sal_True;
while( bOnlySpace && rOutStm.Tell() < nPos )
@@ -118,7 +118,7 @@ sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uIntPtr nBe
void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
{
// keine leeren Klammern schreiben
- sal_uIntPtr nPos = rOutStm.Tell();
+ sal_uLong nPos = rOutStm.Tell();
rOutStm.SeekRel( -1 );
char c = 0;
rOutStm >> c;
@@ -434,10 +434,10 @@ sal_Bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab )
{
- sal_uIntPtr nBeginPos = rOutStm.Tell();
+ sal_uLong nBeginPos = rOutStm.Tell();
WriteTab( rOutStm, nTab );
rOutStm << '[' << endl;
- sal_uIntPtr nOldPos = rOutStm.Tell();
+ sal_uLong nOldPos = rOutStm.Tell();
WriteAttributesSvIdl( rBase, rOutStm, nTab +1 );
// keine leeren Klammern schreiben
@@ -477,14 +477,14 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab,
WriteType nT, WriteAttribute nA )
{
- sal_uIntPtr nBeginPos = rOutStm.Tell();
+ sal_uLong nBeginPos = rOutStm.Tell();
WriteTab( rOutStm, nTab );
rOutStm << '[' << endl;
- sal_uIntPtr nOldPos = rOutStm.Tell();
+ sal_uLong nOldPos = rOutStm.Tell();
WriteAttributes( rBase, rOutStm, nTab +1, nT, nA );
// keine leeren Klammern schreiben
- sal_uIntPtr nPos = rOutStm.Tell();
+ sal_uLong nPos = rOutStm.Tell();
rOutStm.Seek( nOldPos );
sal_Bool bOnlySpace = sal_True;
while( bOnlySpace && rOutStm.Tell() < nPos )
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index c1f528fedf..ee51df27ad 100755
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -41,7 +41,7 @@
#ifdef IDL_COMPILER
/************************************************************************/
static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
- sal_uIntPtr nMin, sal_uIntPtr nMax, sal_uIntPtr* pValue )
+ sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
@@ -53,7 +53,7 @@ static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInSt
pTok = rInStm.GetToken_Next();
if( pTok->IsInteger() )
{
- sal_uIntPtr n = pTok->GetNumber();
+ sal_uLong n = pTok->GetNumber();
if ( n >= nMin && n <= nMax )
{
*pValue = n;
@@ -328,7 +328,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
{
if( SvIdentifier::ReadSvIdl( pName, rInStm ) )
{
- sal_uIntPtr n;
+ sal_uLong n;
if( rBase.FindId( *this, &n ) )
{
nValue = n;
@@ -361,7 +361,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
if( pTok->IsIdentifier() )
{
- sal_uIntPtr n;
+ sal_uLong n;
if( rBase.FindId( pTok->GetString(), &n ) )
{
*(ByteString *)this = pTok->GetString();
@@ -568,7 +568,7 @@ sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
*************************************************************************/
sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
{
- sal_uIntPtr n = 0;
+ sal_uLong n = 0;
sal_uInt32 nTokPos = rInStm.Tell();
if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) )
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 05415ff649..0a2c5314c5 100755
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -135,14 +135,14 @@ void SvMetaModule::Save( SvPersistStream & rStm )
// Compiler Daten schreiben
sal_uInt16 nCmpLen = 0;
- sal_uIntPtr nLenPos = rStm.Tell();
+ sal_uLong nLenPos = rStm.Tell();
rStm << nCmpLen;
#ifdef IDL_COMPILER
rStm << aBeginName;
rStm << aEndName;
rStm << aNextName;
// Laenge der Compiler Daten schreiben
- sal_uIntPtr nPos = rStm.Tell();
+ sal_uLong nPos = rStm.Tell();
rStm.Seek( nLenPos );
rStm << (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) );
rStm.Seek( nPos );
@@ -372,7 +372,7 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
sal_uInt16 nTab )
{
SvMetaExtern::WriteContextSvIdl( rBase, rOutStm, nTab );
- sal_uIntPtr n;
+ sal_uLong n;
for( n = 0; n < aTypeList.Count(); n++ )
{
WriteTab( rOutStm, nTab );
@@ -464,7 +464,7 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
*************************************************************************/
void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
{
- for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
pClass->WriteSfx( rBase, rOutStm );
@@ -474,7 +474,7 @@ void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
Table* pTable )
{
- for( sal_uIntPtr 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 );
@@ -506,7 +506,7 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
void SvMetaModule::WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm,
SvNamePosList & rList )
{
- for( sal_uIntPtr 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() )
@@ -547,7 +547,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
rOutStm << "importlib(\"STDOLE.TLB\");" << endl;
/*
- for( sal_uIntPtr n = 0; n < aTypeList.Count(); n++ )
+ for( sal_uLong n = 0; n < aTypeList.Count(); n++ )
{
SvMetaType * pType = aTypeList.GetObject( n );
if( !pType ->Write( rBase, rOutStm, nTab +1, nT, nA ) )
@@ -555,11 +555,11 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
*/
/*
- for( sal_uIntPtr n = 0; n < rBase.GetModuleList().Count(); n++ )
+ for( sal_uLong n = 0; n < rBase.GetModuleList().Count(); n++ )
{
SvMetaModule * pModule = rBase.GetModuleList().GetObject( n );
const SvMetaTypeMemberList &rTypeList = pModule->GetTypeList();
- for( sal_uIntPtr n = 0; n < rTypeList.Count(); n++ )
+ for( sal_uLong n = 0; n < rTypeList.Count(); n++ )
{
SvMetaType * pType = rTypeList.GetObject( n );
pType->Write( rBase, rOutStm, nTab +1, nT, nA );
@@ -567,7 +567,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
*/
- for( sal_uIntPtr 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() )
@@ -591,7 +591,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
rOutStm << "</MODULE>" << endl << endl;
rOutStm << "<CLASSES>" << endl;
- for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
if( !pClass->IsShell() )
@@ -607,7 +607,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
rOutStm << " ( ";
- for( sal_uIntPtr m=0; m<rClassList.Count(); m++ )
+ for( sal_uLong m=0; m<rClassList.Count(); m++ )
{
SvClassElement *pEle = rClassList.GetObject(m);
SvMetaClass *pCl = pEle->GetClass();
@@ -629,7 +629,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
case WRITE_C_SOURCE:
case WRITE_C_HEADER:
{
- for( sal_uIntPtr 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() */ )
@@ -652,7 +652,7 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
// rOutStm << "#pragma CHARSET IBMPC" << endl;
if( aSlotIdFile.Len() )
rOutStm << "//#include <" << aSlotIdFile.GetBuffer() << '>' << endl;
- for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable );
}
@@ -664,7 +664,7 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab )
{
- for( sal_uIntPtr 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 );
@@ -677,7 +677,7 @@ void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab )
{
- for( sal_uIntPtr 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 344aa0f2a0..ca8ef0ce45 100755
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -179,7 +179,7 @@ void SvMetaClass::FillSbxMemberObject( SvIdlDataBase & rBase,
sal_Bool bVariable )
{
// alle Attribute der Klasse schreiben
- sal_uIntPtr n ;
+ sal_uLong n ;
for( n = 0; n < aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -387,7 +387,7 @@ void SvMetaClass::WriteContextSvIdl
)
{
//SvMetaType::WriteContextSvIdl( rBase, rOutStm, nTab );
- sal_uIntPtr n;
+ sal_uLong n;
for( n = 0; n < aAttrList.Count(); n++ )
{
WriteTab( rOutStm, nTab );
@@ -416,7 +416,7 @@ void SvMetaClass::WriteContextSvIdl
*************************************************************************/
sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
- sal_uIntPtr nTokPos = rInStm.Tell();
+ sal_uLong nTokPos = rInStm.Tell();
if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_CLASS )
{
sal_Bool bOk = sal_True;
@@ -458,7 +458,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
}
- for( sal_uIntPtr 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() )
@@ -535,7 +535,7 @@ void SvMetaClass::WriteOdlMembers( ByteStringList & rSuperList,
SvStream & rOutStm, sal_uInt16 nTab )
{
// alle Attribute schreiben
- sal_uIntPtr n;
+ sal_uLong n;
for( n = 0; n < aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -655,7 +655,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
rOutStm << "</INTERFACE>" << endl << endl;
// alle Attribute schreiben
- sal_uIntPtr n;
+ sal_uLong n;
for( n = 0; n < aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -686,7 +686,7 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
SvStream & rOutStm )
{
sal_uInt16 nCount = 0;
- for( sal_uIntPtr n = 0; n < rSlotList.Count(); n++ )
+ for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
{
SvSlotElement *pEle = rSlotList.GetObject( n );
SvMetaSlot *pAttr = pEle->xSlot;
@@ -707,7 +707,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const ByteString & rShellName,
SvStream & rOutStm )
{
sal_uInt16 nSCount = 0;
- for( sal_uIntPtr n = 0; n < rSlotList.Count(); n++ )
+ for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
{
rSlotList.Seek(n);
SvSlotElement * pEle = rSlotList.GetCurObject();
@@ -736,12 +736,12 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
rClassList.Insert(this, LIST_APPEND);
// alle direkten Attribute schreiben
- sal_uIntPtr n;
+ sal_uLong n;
for( n = 0; n < aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
- sal_uIntPtr nId = pAttr->GetSlotId().GetValue();
+ sal_uLong nId = pAttr->GetSlotId().GetValue();
sal_uInt16 nPos;
for ( nPos=0; nPos < rSuperList.Count(); nPos++ )
{
@@ -800,7 +800,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
rList.Insert(this, LIST_APPEND);
// Meine Imports
- for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvClassElement * pEle = aClassList.GetObject( n );
SvMetaClass * pCl = pEle->GetClass();
@@ -825,7 +825,7 @@ void SvMetaClass::WriteSlotStubs( const ByteString & rShellName,
SvStream & rOutStm )
{
// alle Attribute schreiben
- for( sal_uIntPtr n = 0; n < rSlotList.Count(); n++ )
+ for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
{
SvSlotElement *pEle = rSlotList.GetObject( n );
SvMetaSlot *pAttr = pEle->xSlot;
@@ -876,7 +876,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
SvMetaClassList classList;
SvSlotElementList aSlotList;
InsertSlots(aSlotList, aSuperList, classList, ByteString(), rBase);
- sal_uIntPtr n;
+ sal_uLong n;
for ( n=0; n<aSlotList.Count(); n++ )
{
SvSlotElement *pEle = aSlotList.GetObject( n );
@@ -884,7 +884,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
pSlot->SetListPos(n);
}
- sal_uIntPtr nSlotCount = aSlotList.Count();
+ sal_uLong nSlotCount = aSlotList.Count();
// alle Attribute schreiben
sal_uInt16 nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm );
@@ -944,7 +944,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
Table* pTable )
{
- for( sal_uIntPtr 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 );
@@ -957,7 +957,7 @@ void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaClass::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pTable )
{
- for( sal_uIntPtr 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 );
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 24cf81a79c..ba6321c1e1 100755
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1049,7 +1049,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
sal_uInt16 nId = (sal_uInt16) GetSlotId().GetValue();
sal_uInt16 nListCount = (sal_uInt16) rList.Count();
sal_uInt16 nPos;
- sal_uIntPtr m; // for inner "for" loop
+ sal_uLong m; // for inner "for" loop
if ( !nListCount )
nPos = 0;
@@ -1108,7 +1108,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
// Den MasterSlot clonen
SvMetaSlotRef xEnumSlot;
SvMetaSlot *pFirstEnumSlot = NULL;
- for( sal_uIntPtr n = 0; n < pEnum->Count(); n++ )
+ for( sal_uLong n = 0; n < pEnum->Count(); n++ )
{
// Die SlotId erzeugen
SvMetaEnumValue *enumValue = pEnum->GetObject(n);
@@ -1135,7 +1135,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
{
DBG_ERROR("Invalid EnumSlot!");
xEnumSlot = Clone();
- sal_uIntPtr nValue;
+ sal_uLong nValue;
if ( rBase.FindId(aSId , &nValue) )
{
SvNumberIdentifier aId;
@@ -1163,7 +1163,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
pLinkedSlot = pFirstEnumSlot;
// Slaves untereinander verketten
- rList.Seek((sal_uIntPtr)0);
+ rList.Seek((sal_uLong)0);
xEnumSlot = pFirstEnumSlot;
SvSlotElement *pEle;
do
@@ -1483,7 +1483,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
pType = pMethod->GetType();
else
pType = GetType();
- sal_uIntPtr nSCount = pType->GetAttrCount();
+ sal_uLong nSCount = pType->GetAttrCount();
rOutStm << ByteString::CreateFromInt32( nSCount ).GetBuffer() << "/*Count*/";
}
else
@@ -1549,7 +1549,7 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
const SvMetaAttributeMemberList & rList =
pType->GetAttrList();
- for( sal_uIntPtr n = 0; n < rList.Count(); n++ )
+ for( sal_uLong n = 0; n < rList.Count(); n++ )
{
SvMetaAttribute * pPar = rList.GetObject( n );
SvMetaType * pPType = pPar->GetType();
@@ -1603,7 +1603,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
if (!GetToolBoxConfig() && !GetAccelConfig() && !GetMenuConfig() && !GetStatusBarConfig() )
return;
- sal_uIntPtr nSId = GetSlotId().GetValue();
+ sal_uLong nSId = GetSlotId().GetValue();
if( !pTable->IsKeyValid( nSId ) )
{
pTable->Insert( nSId, this );
@@ -1630,7 +1630,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
if( GetPseudoSlots() && pEnum )
{
- for( sal_uIntPtr n = 0; n < pEnum->Count(); n++ )
+ for( sal_uLong n = 0; n < pEnum->Count(); n++ )
{
ByteString aValName = pEnum->GetObject( n )->GetName();
ByteString aSId( GetSlotId() );
@@ -1639,7 +1639,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
aSId += '_';
aSId += aValName.Copy( pEnum->GetPrefix().Len() );
- sal_uIntPtr nSId2;
+ sal_uLong nSId2;
sal_Bool bIdOk = sal_False;
if( rBase.FindId( aSId, &nSId2 ) )
{
@@ -1672,7 +1672,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pTable )
{
- sal_uIntPtr nSId = GetSlotId().GetValue();
+ sal_uLong nSId = GetSlotId().GetValue();
if( !pTable->IsKeyValid( nSId ) )
{
pTable->Insert( nSId, this );
@@ -1682,7 +1682,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
if( GetPseudoSlots() && pEnum )
{
- for( sal_uIntPtr n = 0; n < pEnum->Count(); n++ )
+ for( sal_uLong n = 0; n < pEnum->Count(); n++ )
{
ByteString aValName = pEnum->GetObject( n )->GetName();
ByteString aSId( GetSlotId() );
@@ -1691,7 +1691,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
aSId += '_';
aSId += aValName.Copy( pEnum->GetPrefix().Len() );
- sal_uIntPtr nSId2;
+ sal_uLong nSId2;
sal_Bool bIdOk = sal_False;
if( rBase.FindId( aSId, &nSId2 ) )
{
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index edb9d50da4..a774501738 100755
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -267,8 +267,8 @@ void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, sal_uInt16 nSbxFlags )
if( pBaseType->GetType() == TYPE_STRUCT )
{
const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
- sal_uIntPtr nCount = rList.Count();
- for( sal_uIntPtr i = 0; i < nCount; i++ )
+ sal_uLong nCount = rList.Count();
+ for( sal_uLong i = 0; i < nCount; i++ )
rList.GetObject( i )->FillSbxObject( pInfo, nSbxFlags );
}
else
@@ -303,8 +303,8 @@ void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase,
if ( GetSlotId().Len() )
rBase.aStructSlotId = GetSlotId();
const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
- sal_uIntPtr nCount = rList.Count();
- for( sal_uIntPtr i = 0; i < nCount; i++ )
+ sal_uLong nCount = rList.Count();
+ for( sal_uLong i = 0; i < nCount; i++ )
rList.GetObject( i )->FillSbxObject( rBase, pObj, bVariable );
rBase.aStructSlotId = aSlotId;
}
@@ -418,7 +418,7 @@ void SvMetaAttribute::WriteSvIdl
rOutStm << ' ' << aSlotId.GetBuffer();
if( pType->GetType() == TYPE_METHOD )
pType->WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
- sal_uIntPtr nPos = rOutStm.Tell();
+ sal_uLong nPos = rOutStm.Tell();
rOutStm << endl;
SvMetaName::WriteSvIdl( rBase, rOutStm, nTab );
TestAndSeekSpaceOnly( rOutStm, nPos );
@@ -529,8 +529,8 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
if( pBaseType->GetType() == TYPE_STRUCT )
{
const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
- sal_uIntPtr nCount = rList.Count();
- for( sal_uIntPtr 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 )
@@ -584,10 +584,10 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
|*
|* Beschreibung
*************************************************************************/
-sal_uIntPtr SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const
+sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const
{
const SvNumberIdentifier & rId = GetSlotId();
- sal_uIntPtr n = rId.GetValue();
+ sal_uLong n = rId.GetValue();
if( rBase.aStructSlotId.Len() )
{
n = n << 20;
@@ -743,7 +743,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
WriteType nT, WriteAttribute nA )
{
const SvMetaAttributeMemberList & rList = GetType()->GetBaseType()->GetAttrList();
- sal_uIntPtr nCount = rList.Count();
+ sal_uLong nCount = rList.Count();
SvNumberIdentifier slotId = rBase.aStructSlotId;
if ( GetSlotId().Len() )
@@ -754,7 +754,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
if ( GetReadonly() )
nA |= WA_READONLY;
- for( sal_uIntPtr i = 0; i < nCount; i++ )
+ for( sal_uLong i = 0; i < nCount; i++ )
{
SvMetaAttribute *pAttr = rList.GetObject( i );
if ( nT == WRITE_DOCU )
@@ -970,7 +970,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
|*
|* Beschreibung
*************************************************************************/
-sal_uIntPtr SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
@@ -1413,7 +1413,7 @@ void SvMetaType::FillSbxObject( SbxVariable * pObj, sal_Bool bVariable )
{
if( GetType() == TYPE_METHOD )
{
- sal_uIntPtr nCount = GetAttrCount();
+ sal_uLong nCount = GetAttrCount();
if( nCount )
{
SbxInfoRef xInfo = pObj->GetInfo();
@@ -1422,7 +1422,7 @@ void SvMetaType::FillSbxObject( SbxVariable * pObj, sal_Bool bVariable )
xInfo = new SbxInfo();
pObj->SetInfo( xInfo );
}
- for( sal_uIntPtr n = nCount; n > 0; n-- )
+ for( sal_uLong n = nCount; n > 0; n-- )
pAttrList->GetObject( n -1 )->FillSbxObject( xInfo );
}
}
@@ -1563,7 +1563,7 @@ void SvMetaType::WriteSvIdl
if( GetType() == TYPE_METHOD )
WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
- sal_uIntPtr nOldPos = rOutStm.Tell();
+ sal_uLong nOldPos = rOutStm.Tell();
rOutStm << endl;
SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab );
if( TestAndSeekSpaceOnly( rOutStm, nOldPos ) )
@@ -1890,15 +1890,15 @@ void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
|*
|* Beschreibung
*************************************************************************/
-sal_uIntPtr SvMetaType::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray )
{
- sal_uIntPtr nC = 0;
+ sal_uLong nC = 0;
if( GetBaseType()->GetType() == TYPE_STRUCT )
{
- sal_uIntPtr nAttrCount = GetAttrCount();
+ sal_uLong nAttrCount = GetAttrCount();
// Die einzelnen Attribute schreiben
- for( sal_uIntPtr n = 0; n < nAttrCount; n++ )
+ for( sal_uLong n = 0; n < nAttrCount; n++ )
{
nC += pAttrList->GetObject( n )->MakeSfx( pAttrArray );
if( n +1 < nAttrCount )
@@ -1918,8 +1918,8 @@ void SvMetaType::WriteSfxItem(
ByteString aTypeName = "SfxType";
ByteString aAttrArray;
- sal_uIntPtr nAttrCount = MakeSfx( &aAttrArray );
- //sal_uIntPtr nAttrCount = GetAttrCount();
+ sal_uLong nAttrCount = MakeSfx( &aAttrArray );
+ //sal_uLong nAttrCount = GetAttrCount();
ByteString aAttrCount( ByteString::CreateFromInt32( nAttrCount ) );
aTypeName += aAttrCount;
@@ -2232,9 +2232,9 @@ ByteString SvMetaType::GetParserString() const
if( TYPE_METHOD == type || TYPE_STRUCT == type )
{
- sal_uIntPtr nAttrCount = GetAttrCount();
+ sal_uLong nAttrCount = GetAttrCount();
// Die einzelnen Attribute schreiben
- for( sal_uIntPtr n = 0; n < nAttrCount; n++ )
+ for( sal_uLong n = 0; n < nAttrCount; n++ )
{
SvMetaAttribute * pT = pAttrList->GetObject( n );
aPStr += pT->GetType()->GetParserString();
@@ -2264,9 +2264,9 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
if( TYPE_METHOD == type || TYPE_STRUCT == type )
{
- sal_uIntPtr nAttrCount = GetAttrCount();
+ sal_uLong nAttrCount = GetAttrCount();
// Die einzelnen Attribute schreiben
- for( sal_uIntPtr n = 0; n < nAttrCount; n++ )
+ for( sal_uLong n = 0; n < nAttrCount; n++ )
{
SvMetaAttribute * pA = pAttrList->GetObject( n );
// Fuer Methoden ist rChief immer ""
@@ -2455,7 +2455,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
sal_uInt16 SvMetaTypeEnum::GetMaxValue() const
{
sal_uInt16 nMax = 0;
- for( sal_uIntPtr n = 0; n < aEnumValueList.Count(); n++ )
+ for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
{
SvMetaEnumValue * pObj = aEnumValueList.GetObject( n );
if( nMax < pObj->GetValue() )
@@ -2509,7 +2509,7 @@ void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
sal_uInt16 nTab )
{
WriteTab( rOutStm, nTab +1 );
- for( sal_uIntPtr 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() )
@@ -2580,7 +2580,7 @@ void SvMetaTypeEnum::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteType nT, WriteAttribute nA )
{
WriteTab( rOutStm, nTab +1 );
- for( sal_uIntPtr 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 );
@@ -2645,7 +2645,7 @@ ByteString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
if ( aType->GetAttrCount() )
{
- sal_uIntPtr nCount = aType->GetAttrCount();
+ sal_uLong nCount = aType->GetAttrCount();
SvMetaAttributeMemberList& rList = aType->GetAttrList();
SvMetaAttributeMemberList& rOtherList = pAttr->GetType()->GetAttrList();
if ( pAttr->GetType()->GetAttrCount() != nCount )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index f3e3b72944..12b51466e0 100755
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -264,7 +264,7 @@ SvCommand::SvCommand( int argc, char ** argv )
StringList aList;
if( ResponseFile( &aList, argc, argv ) )
- for( sal_uIntPtr i = 1; i < aList.Count(); i++ )
+ for( sal_uLong i = 1; i < aList.Count(); i++ )
{
String aParam( *aList.GetObject( i ) );
sal_Unicode aFirstChar( aParam.GetChar(0) );
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index f23cf3c04b..acb02adbb7 100755
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -113,7 +113,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
// A c h t u n g !!!, bei hinzufuegen von Typen werden alle
- // bin„ren Datenbasen inkompatibel
+ // bin�ren Datenbasen inkompatibel
/*
// So tun als ob die Init-Daten auf einem Stream gelesen wurden
@@ -139,7 +139,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
*************************************************************************/
SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
{
- for( sal_uIntPtr n = 0; n < aModuleList.Count(); n++ )
+ for( sal_uLong n = 0; n < aModuleList.Count(); n++ )
if( aModuleList.GetObject( n )->GetName() == rName )
return aModuleList.GetObject( n );
return NULL;
@@ -157,7 +157,7 @@ SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
sal_Bool SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
{
sal_uInt32 nSig = 0;
- sal_uIntPtr nPos = rStm.Tell();
+ sal_uLong nPos = rStm.Tell();
rStm >> nSig;
rStm.Seek( nPos );
@@ -221,7 +221,7 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
if( bOnlyStreamedObjs )
{
SvMetaClassMemberList aList;
- for( sal_uIntPtr n = 0; n < GetModuleList().Count(); n++ )
+ for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
{
SvMetaModule * pModule = GetModuleList().GetObject( n );
if( !pModule->IsImported() )
@@ -275,7 +275,7 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
|* Beschreibung
|*
*************************************************************************/
-sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uIntPtr * pVal )
+sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uLong * pVal )
{
if( pIdTable )
{
@@ -296,7 +296,7 @@ sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uIntPtr * pVal )
|* Beschreibung
|*
*************************************************************************/
-sal_Bool SvIdlDataBase::InsertId( const ByteString & rIdName, sal_uIntPtr nVal )
+sal_Bool SvIdlDataBase::InsertId( const ByteString & rIdName, sal_uLong nVal )
{
if( !pIdTable )
pIdTable = new SvStringHashTable( 20003 );
@@ -355,14 +355,14 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
return sal_False;
}
- sal_uIntPtr nVal = 0;
+ sal_uLong nVal = 0;
sal_Bool bOk = sal_True;
while( bOk )
{
pTok = aTokStm.GetToken_Next();
if( pTok->IsIdentifier() )
{
- sal_uIntPtr n;
+ sal_uLong n;
if( FindId( pTok->GetString(), &n ) )
nVal += n;
else
@@ -615,7 +615,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
/*
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsIdentifier() )
- for( sal_uIntPtr n = 0; n < aAttrList.Count(); n++ )
+ for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( n );
if( pAttr->GetName() == pTok->GetString() )
@@ -629,10 +629,10 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsIdentifier() )
{
- sal_uIntPtr n;
+ sal_uLong n;
if( FindId( pTok->GetString(), &n ) )
{
- for( sal_uIntPtr i = 0; i < aAttrList.Count(); i++ )
+ for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( i );
if( pAttr->GetSlotId() == pTok->GetString() )
@@ -655,10 +655,10 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr
const SvNumberIdentifier& rId
)
{
- sal_uIntPtr n;
+ sal_uLong n;
if( FindId( rId, &n ) )
{
- for( sal_uIntPtr i = 0; i < aAttrList.Count(); i++ )
+ for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( i );
if( pAttr->GetSlotId() == rId )
@@ -680,7 +680,7 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsIdentifier() )
- for( sal_uIntPtr n = 0; n < aClassList.Count(); n++ )
+ for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
if( pClass->GetName() == pTok->GetString() )
@@ -710,7 +710,7 @@ void SvIdlDataBase::Write( const ByteString & rText )
void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
const ByteString & rFileName,
const ByteString & rErrorText,
- sal_uIntPtr nRow, sal_uIntPtr nColumn ) const
+ sal_uLong nRow, sal_uLong nColumn ) const
{
//Fehlerbehandlung
fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n",
@@ -732,7 +732,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
//Fehlerbehandlung
String aFileName( rInStm.GetFileName() );
ByteString aErrorText;
- sal_uIntPtr nRow = 0, nColumn = 0;
+ sal_uLong nRow = 0, nColumn = 0;
rInStm.SeekEnd();
SvToken *pTok = rInStm.GetToken();
@@ -910,7 +910,7 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
}
}
- for( sal_uIntPtr n = 0; n < GetModuleList().Count(); n++ )
+ for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
{
SvMetaModule * pModule = GetModuleList().GetObject( n );
//if( !pModule->IsImported() )
@@ -932,7 +932,7 @@ sal_Bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
// alle Tmp-Variablen fuer das Schreiben zuruecksetzen
WriteReset();
SvMemoryStream aTmpStm( 256000, 256000 );
- sal_uIntPtr n;
+ sal_uLong n;
for( n = 0; n < GetModuleList().Count(); n++ )
{
SvMetaModule * pModule = GetModuleList().GetObject( n );
@@ -956,7 +956,7 @@ sal_Bool SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
return sal_False;
Table aIdTable;
- sal_uIntPtr n;
+ sal_uLong n;
for( n = 0; n < GetModuleList().Count(); n++ )
{
SvMetaModule * pModule = GetModuleList().GetObject( n );
@@ -999,8 +999,8 @@ void SvIdlDataBase::AppendAttr( SvMetaAttribute *pAttr )
sal_Bool SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
{
SvMetaAttributeMemberList &rList = GetAttrList();
- sal_uIntPtr nCount = rList.Count();
- for ( sal_uIntPtr n=0; n<nCount; n++ )
+ sal_uLong nCount = rList.Count();
+ for ( sal_uLong n=0; n<nCount; n++ )
{
if ( rList.GetObject(n)->IsNewAttribute() )
{
@@ -1024,7 +1024,7 @@ sal_Bool SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
if( rOutStm.GetError() != SVSTREAM_OK )
return sal_False;
- for( sal_uIntPtr n = 0; n < GetModuleList().Count(); n++ )
+ for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
{
SvMetaModule * pModule = GetModuleList().GetObject( n );
if( !pModule->IsImported() )
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 74ca58fb39..bde3f9674c 100755
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -40,8 +40,8 @@
sal_Bool FileMove_Impl( const String & rFile1, const String & rFile2, sal_Bool bImmerVerschieben )
{
//printf( "Move from %s to %s\n", rFile2.GetStr(), rFile1.GetStr() );
- sal_uIntPtr nC1 = 0;
- sal_uIntPtr nC2 = 1;
+ sal_uLong nC1 = 0;
+ sal_uLong nC2 = 1;
if( !bImmerVerschieben )
{
SvFileStream aOutStm1( rFile1, STREAM_STD_READ );