diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-27 07:52:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-27 12:59:46 +0000 |
| commit | f75694e5b13236248171885633b0a3612940e04a (patch) | |
| tree | 68dc468fde558672059ec50a7966a6461844ddaf /idl/inc/lex.hxx | |
| parent | 41e92ab2b7a8fcb7f5738f656bdac47bc0847f29 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'idl/inc/lex.hxx')
| -rw-r--r-- | idl/inc/lex.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index 3b51dd848f2b..03b657890f71 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -45,13 +45,13 @@ class BigInt; class SvToken { friend class SvTokenStream; - sal_uLong nLine, nColumn; + sal_uLong nLine, nColumn; SVTOKEN_ENUM nType; - ByteString aString; + rtl::OString aString; union { - sal_uLong nLong; - sal_Bool bBool; + sal_uLong nLong; + sal_Bool bBool; char cChar; SvStringHashEntry * pHash; }; @@ -61,7 +61,7 @@ public: SvToken( sal_uLong n ); SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b ); SvToken( char c ); - SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr ); + SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr ); SvToken( SVTOKEN_ENUM nTypeP ); SvToken & operator = ( const SvToken & rObj ); @@ -91,7 +91,7 @@ public: sal_Bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; } sal_Bool IsEof() const { return nType == SVTOKEN_EOF; } - const ByteString & GetString() const + const rtl::OString& GetString() const { return IsIdentifierHash() ? pHash->GetName() @@ -122,7 +122,7 @@ inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b ) inline SvToken::SvToken( char c ) : nType( SVTOKEN_CHAR ), cChar( c ) {} -inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr ) +inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr ) : nType( nTypeP ), aString( rStr ) {} inline SvToken::SvToken( SVTOKEN_ENUM nTypeP ) |