diff options
| author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
|---|---|---|
| committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
| commit | fa1f3c352c6126b24ab5af87ea4ebea742c546c2 (patch) | |
| tree | 5a5240e4969fee626bb060bd386fceb957081f90 /idl/source/cmptools | |
| parent | d0097a3f35e5e2c68d293d604a2f6f51b2d822a5 (diff) | |
| parent | 3c21373571fd0cf89391502aa132c5f420cd75c6 (diff) | |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'idl/source/cmptools')
| -rwxr-xr-x | idl/source/cmptools/hash.cxx | 8 | ||||
| -rwxr-xr-x | idl/source/cmptools/lex.cxx | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index cf78e9664233..c212289823ed 100755 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -73,8 +73,8 @@ SvHashTable::SvHashTable( sal_uInt32 nMaxEntries ) SvHashTable::~SvHashTable() { #ifdef DOS_NIE - printf( "Maximum: %ld, Fllung: %ld\n", (ULONG)nMax, (ULONG)nFill ); - printf( "Anfragen: %ld, Versuche: %ld", (ULONG)lAsk, (ULONG)lTry ); + printf( "Maximum: %ld, Fllung: %ld\n", (sal_uIntPtr)nMax, (sal_uIntPtr)nFill ); + printf( "Anfragen: %ld, Versuche: %ld", (sal_uIntPtr)lAsk, (sal_uIntPtr)lTry ); if( lTry != 0 ) printf( ", V/E = %ld\n", lTry / lAsk ); #endif @@ -141,10 +141,6 @@ sal_Bool SvHashTable::Test_Insert( const void * pElement, sal_Bool bInsert, SvStringHashTable::SvStringHashTable( sal_uInt32 nMaxEntries ) : SvHashTable( nMaxEntries ) { -#ifdef WIN - DBG_ASSERT( (sal_uInt32)nMaxEntries * sizeof( SvStringHashEntry ) <= 0xFF00, - "Hash table size cannot exeed 64k byte" ) -#endif pEntries = new SvStringHashEntry[ nMaxEntries ]; // RefCount auf eins setzen diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index f52185e80e4b..98c835a95065 100755 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -146,11 +146,7 @@ SvToken & SvToken::operator = ( const SvToken & rObj ) *************************************************************************/ void SvTokenStream::InitCtor() { -#ifdef DOS - SetCharSet( CHARSET_ANSI ); -#else SetCharSet( gsl_getSystemTextEncoding() ); -#endif aStrTrue = "TRUE"; aStrFalse = "FALSE"; nLine = nColumn = 0; @@ -251,11 +247,7 @@ void SvTokenStream::SetCharSet( CharSet nSet ) { nCharSet = nSet; -#ifdef DOS - pCharTab = SvChar::GetTable( nSet, CHARSET_ANSI ); -#else pCharTab = SvChar::GetTable( nSet, gsl_getSystemTextEncoding() ); -#endif } /************************************************************************* |