summaryrefslogtreecommitdiff
path: root/rsc/source/res/rscclass.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-07-19 16:14:40 +0000
committerKurt Zenker <kz@openoffice.org>2006-07-19 16:14:40 +0000
commit627cd53204c8c14ae26e2a87d7e590569bfc80c8 (patch)
tree9dc3f45de60341e2285587a0da4befbd643bcf93 /rsc/source/res/rscclass.cxx
parentee171843af9598daa89833e3d8d63ced925178d9 (diff)
INTEGRATION: CWS warningfixes02 (1.7.8); FILE MERGED
2006/06/30 12:31:16 sb 1.7.8.1: #i66577# Made the code compile (warning-free) on a unxlngi6.pro GCC 4.1.1 Linux box.
Diffstat (limited to 'rsc/source/res/rscclass.cxx')
-rw-r--r--rsc/source/res/rscclass.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 164aacbe3de8..3f5ef45af39a 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: rscclass.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 05:47:40 $
+ * last change: $Author: kz $ $Date: 2006-07-19 17:14:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1069,7 +1069,8 @@ void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC )
// Superaufruf
fprintf( fOutput, "\n\t: %s", pHS->getString( GetSuperClass()->GetId() ).getStr() );
fprintf( fOutput, "%s", GetSuperClass()->aCallPar1.GetBuffer() );
- fprintf( fOutput, " rResId.SetRT2( 0x%x ) )", GetTypId() );
+ fprintf( fOutput, " rResId.SetRT2( 0x%lx ) )",
+ sal::static_int_cast< unsigned long >(GetTypId()) );
}
fprintf( fOutput, "\n{\n" );
fprintf( fOutput, "\tsal_uInt32\tnObjMask;\n" );
@@ -1083,8 +1084,9 @@ void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC )
{
if( !((VAR_NODATAINST | VAR_NORC) & pVarTypeList[ i ].nVarType ))
{
- fprintf( fOutput, "\tif( nObjMask & 0x%x )\n\t{\n",
- pVarTypeList[ i ].nMask );
+ fprintf( fOutput, "\tif( nObjMask & 0x%lx )\n\t{\n",
+ sal::static_int_cast< unsigned long >(
+ pVarTypeList[ i ].nMask) );
pVarTypeList[ i ].pClass->WriteRcAccess( fOutput, pTC,
pHS->getString( pVarTypeList[ i ].nVarName ).getStr() );