diff options
Diffstat (limited to 'rsc/source/parser/rscibas.cxx')
-rw-r--r-- | rsc/source/parser/rscibas.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 1acd8abc3bf8..f2456cfca257 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -53,7 +53,7 @@ #include <boost/unordered_map.hpp> /****************** M A C R O S ******************************************/ -void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal ) +void RscTypCont::SETCONST( RscConst * pClass, const char * szString, sal_uInt32 nVal ) { #if OSL_DEBUG_LEVEL > 2 fprintf( stderr, "setconst : %s\n", szString ); @@ -62,7 +62,7 @@ void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal CONSTNAME, nVal ), nVal ); } -void RscTypCont::SETCONST( RscConst * pClass, Atom nName, UINT32 nVal ) +void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal ) { #if OSL_DEBUG_LEVEL > 2 fprintf( stderr, "setconst hash: %u\n", (unsigned int)nName ); @@ -103,7 +103,7 @@ void RscLangEnum::Init( RscNameTable& rNames ) while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW )) { #if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "ISO Language in : %d %d %s\n", + fprintf( stderr, "ISO Language in : %d\n", (int)nIndex, pLangEntry->mnLang, MsLangId::convertLanguageToIsoByteString( pLangEntry->mnLang ).getStr() ); @@ -201,7 +201,7 @@ Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames ) mnLangId++; } #if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "AddLanguage( %s ) = 0x%lx\n", pLang, nResult ); + fprintf( stderr, "AddLanguage( %s ) = %d\n", pLang, nResult ); #endif return nResult; } @@ -460,12 +460,12 @@ RscEnum * RscTypCont::InitMessButtons() { RscEnum * pMessButtons; pMessButtons = new RscEnum( pHS->getID( "EnumMessButtons" ), RSC_NOTYPE ); - SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<UINT32>(WB_OK) ); - SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<UINT32>(WB_OK_CANCEL) ); - SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<UINT32>(WB_YES_NO) ); - SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<UINT32>(WB_YES_NO_CANCEL) ); - SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<UINT32>(WB_RETRY_CANCEL) ); - SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<UINT32>(WB_ABORT_RETRY_IGNORE) ); + SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<sal_uInt32>(WB_OK) ); + SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<sal_uInt32>(WB_OK_CANCEL) ); + SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<sal_uInt32>(WB_YES_NO) ); + SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<sal_uInt32>(WB_YES_NO_CANCEL) ); + SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<sal_uInt32>(WB_RETRY_CANCEL) ); + SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<sal_uInt32>(WB_ABORT_RETRY_IGNORE) ); return( pMessButtons ); } @@ -479,12 +479,12 @@ RscEnum * RscTypCont::InitMessDefButton(){ pMessDefButton = new RscEnum( pHS->getID( "EnumMessDefButton" ), RSC_NOTYPE ); - SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<UINT32>(WB_DEF_OK) ); - SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<UINT32>(WB_DEF_CANCEL) ); - SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<UINT32>(WB_DEF_RETRY) ); - SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<UINT32>(WB_DEF_YES) ); - SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<UINT32>(WB_DEF_NO) ); - SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<UINT32>(WB_DEF_IGNORE) ); + SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<sal_uInt32>(WB_DEF_OK) ); + SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<sal_uInt32>(WB_DEF_CANCEL) ); + SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<sal_uInt32>(WB_DEF_RETRY) ); + SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<sal_uInt32>(WB_DEF_YES) ); + SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<sal_uInt32>(WB_DEF_NO) ); + SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<sal_uInt32>(WB_DEF_IGNORE) ); return( pMessDefButton ); } |