Kaydet (Commit) b905d3e9 authored tarafından Matteo Casalin's avatar Matteo Casalin

sal_uIntPtr to sal_Int32

Change-Id: Ib21faeca4ca05bcb534c0418025c7f2607d21077
üst 88f48668
...@@ -38,17 +38,16 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : ...@@ -38,17 +38,16 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) :
Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILY_ITEM ) ) Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILY_ITEM ) )
{ {
sal_uIntPtr nMask = ReadLongRes(); const sal_Int32 nMask = ReadLongRes();
if(nMask & RSC_SFX_STYLE_ITEM_LIST) if(nMask & RSC_SFX_STYLE_ITEM_LIST)
{ {
sal_uIntPtr nCount = ReadLongRes(); const sal_Int32 nCount = ReadLongRes();
for( sal_uIntPtr i = 0; i < nCount; i++ ) for( sal_Int32 i = 0; i < nCount; ++i )
{ {
SfxFilterTupel *pTupel = new SfxFilterTupel; SfxFilterTupel *pTupel = new SfxFilterTupel;
pTupel->aName = ReadStringRes(); pTupel->aName = ReadStringRes();
long lFlags = ReadLongRes(); pTupel->nFlags = static_cast<sal_uInt16>(ReadLongRes());
pTupel->nFlags = (sal_uInt16)lFlags;
aFilterList.push_back( pTupel ); aFilterList.push_back( pTupel );
} }
} }
...@@ -67,7 +66,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : ...@@ -67,7 +66,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) :
} }
if(nMask & RSC_SFX_STYLE_ITEM_STYLEFAMILY) if(nMask & RSC_SFX_STYLE_ITEM_STYLEFAMILY)
{ {
nFamily = (sal_uInt16)ReadLongRes(); nFamily = static_cast<sal_uInt16>(ReadLongRes());
} }
else else
nFamily = SFX_STYLE_FAMILY_PARA; nFamily = SFX_STYLE_FAMILY_PARA;
...@@ -98,8 +97,8 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem() ...@@ -98,8 +97,8 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem()
SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) : SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) :
Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILIES ).SetAutoRelease( false ) ) Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILIES ).SetAutoRelease( false ) )
{ {
sal_uIntPtr nCount = ReadLongRes(); const sal_Int32 nCount = ReadLongRes();
for( sal_uIntPtr i = 0; i < nCount; i++ ) for( sal_Int32 i = 0; i < nCount; ++i )
{ {
const ResId aResId(static_cast<RSHEADER_TYPE *>(GetClassRes()), *rResId.GetResMgr()); const ResId aResId(static_cast<RSHEADER_TYPE *>(GetClassRes()), *rResId.GetResMgr());
SfxStyleFamilyItem *pItem = new SfxStyleFamilyItem(aResId); SfxStyleFamilyItem *pItem = new SfxStyleFamilyItem(aResId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment