summaryrefslogtreecommitdiff
path: root/idl/inc/lex.hxx
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
commitd1b478f18dee26565d638054f54fabd5ac87c346 (patch)
tree3bc243bece2356bf97450ab0eeaf81fd3f5e6ce5 /idl/inc/lex.hxx
parent7afd69a40182db58aef59502f78705ffaffd19c6 (diff)
removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in idl
Diffstat (limited to 'idl/inc/lex.hxx')
-rwxr-xr-xidl/inc/lex.hxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index b276ad49c9d9..9c7ecdd95f3a 100755
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -44,12 +44,12 @@ class BigInt;
class SvToken
{
friend class SvTokenStream;
- sal_uIntPtr nLine, nColumn;
+ sal_uLong nLine, nColumn;
SVTOKEN_ENUM nType;
ByteString aString;
union
{
- sal_uIntPtr nLong;
+ sal_uLong nLong;
sal_Bool bBool;
char cChar;
// SvRttiBase * pComplexObj;
@@ -58,7 +58,7 @@ friend class SvTokenStream;
public:
SvToken();
SvToken( const SvToken & rObj );
- SvToken( sal_uIntPtr n );
+ SvToken( sal_uLong n );
SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
SvToken( char c );
SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
@@ -70,11 +70,11 @@ public:
ByteString GetTokenAsString() const;
SVTOKEN_ENUM GetType() const { return nType; }
- void SetLine( sal_uIntPtr nLineP ) { nLine = nLineP; }
- sal_uIntPtr GetLine() const { return nLine; }
+ void SetLine( sal_uLong nLineP ) { nLine = nLineP; }
+ sal_uLong GetLine() const { return nLine; }
- void SetColumn( sal_uIntPtr nColumnP ) { nColumn = nColumnP; }
- sal_uIntPtr GetColumn() const { return nColumn; }
+ void SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP; }
+ sal_uLong GetColumn() const { return nColumn; }
sal_Bool IsEmpty() const { return nType == SVTOKEN_EMPTY; }
sal_Bool IsComment() const { return nType == SVTOKEN_COMMENT; }
@@ -98,7 +98,7 @@ public:
? pHash->GetName()
: aString;
}
- sal_uIntPtr GetNumber() const { return nLong; }
+ sal_uLong GetNumber() const { return nLong; }
sal_Bool GetBool() const { return bBool; }
char GetChar() const { return cChar; }
// SvRttiBase *GetObject() const { return pComplexObj; }
@@ -115,7 +115,7 @@ public:
inline SvToken::SvToken()
: nType( SVTOKEN_EMPTY ) {}
-inline SvToken::SvToken( sal_uIntPtr n )
+inline SvToken::SvToken( sal_uLong n )
: nType( SVTOKEN_INTEGER ), nLong( n ) {}
inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
@@ -141,7 +141,7 @@ DECLARE_LIST( SvTokenList, SvToken * )
/******************** class SvTokenStream ********************************/
class SvTokenStream
{
- sal_uIntPtr nLine, nColumn;
+ sal_uLong nLine, nColumn;
int nBufPos;
int c; // naechstes Zeichen
CharSet nCharSet;
@@ -149,7 +149,7 @@ class SvTokenStream
sal_uInt16 nTabSize; // Tabulator Laenge
ByteString aStrTrue;
ByteString aStrFalse;
- sal_uIntPtr nMaxPos;
+ sal_uLong nMaxPos;
SvFileStream * pInStream;
SvStream & rInStream;
@@ -167,12 +167,12 @@ class SvTokenStream
}
void FillTokenList();
- sal_uIntPtr GetNumber();
+ sal_uLong GetNumber();
sal_Bool MakeToken( SvToken & );
sal_Bool IsEof() const { return rInStream.IsEof(); }
void SetMax()
{
- sal_uIntPtr n = Tell();
+ sal_uLong n = Tell();
if( n > nMaxPos )
nMaxPos = n;
}