diff options
Diffstat (limited to 'sfx2/source/dialog/styfitem.cxx')
| -rw-r--r-- | sfx2/source/dialog/styfitem.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index a33677c6b2ae..ba6fac0fdee8 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -54,17 +54,17 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILY_ITEM ) ) { - ULONG nMask = ReadLongRes(); + sal_uIntPtr nMask = ReadLongRes(); if(nMask & RSC_SFX_STYLE_ITEM_LIST) { - ULONG nCount = ReadLongRes(); - for( ULONG i = 0; i < nCount; i++ ) + sal_uIntPtr nCount = ReadLongRes(); + for( sal_uIntPtr i = 0; i < nCount; i++ ) { SfxFilterTupel *pTupel = new SfxFilterTupel; pTupel->aName = ReadStringRes(); long lFlags = ReadLongRes(); - pTupel->nFlags = (USHORT)lFlags; + pTupel->nFlags = (sal_uInt16)lFlags; aFilterList.Insert(pTupel, LIST_APPEND); } } @@ -83,7 +83,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : } if(nMask & RSC_SFX_STYLE_ITEM_STYLEFAMILY) { - nFamily = (USHORT)ReadLongRes(); + nFamily = (sal_uInt16)ReadLongRes(); } else nFamily = SFX_STYLE_FAMILY_PARA; @@ -116,11 +116,11 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem() SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) : - Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILIES ).SetAutoRelease( FALSE ) ), + Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILIES ).SetAutoRelease( sal_False ) ), aEntryList( 4, 1 ) { - ULONG nCount = ReadLongRes(); - for( ULONG i = 0; i < nCount; i++ ) + sal_uIntPtr nCount = ReadLongRes(); + for( sal_uIntPtr i = 0; i < nCount; i++ ) { const ResId aResId((RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr()); SfxStyleFamilyItem *pItem = new SfxStyleFamilyItem(aResId); |