diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:26:54 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:26:54 +0100 |
commit | 9abbe475a491631d77199a511382b39b748926a0 (patch) | |
tree | bd0600aa975d1db58370da2a7562f8035b96358c /rsc/source/parser/rscibas.cxx | |
parent | debuglevels: silence WaE with uncmaxci.pro+debug (diff) | |
parent | DEV300 masterfix: #i116814,i116838#: fix XCloneable so that tests work again (diff) | |
download | core-9abbe475a491631d77199a511382b39b748926a0.tar.gz core-9abbe475a491631d77199a511382b39b748926a0.zip |
debuglevels: pulled and merged DEV300.m100
Diffstat (limited to 'rsc/source/parser/rscibas.cxx')
-rw-r--r-- | rsc/source/parser/rscibas.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index a60db4f54d2f..75239f82e55b 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -52,7 +52,7 @@ #include <hash_map> /****************** 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 ); @@ -61,7 +61,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 ); @@ -484,12 +484,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 ); } @@ -507,12 +507,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 ); } |