diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-08 08:08:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-09 07:55:10 +0000 |
| commit | 1edcad0daca7f00559fe7cf100438e105623b3eb (patch) | |
| tree | ef0be4f736cf9b0977ff14e4e58e9a405f4a59e1 /sfx2 | |
| parent | 116cf0b298ed62f26a60db51164f6510007d2579 (diff) | |
convert SFX_STYLE_ITEM to scoped enum
Change-Id: I929603a12c29931074a467d1472ef686c1d4e8ee
Reviewed-on: https://gerrit.libreoffice.org/24751
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/styfitem.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index 4abdb0a35629..c851670650a1 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -31,7 +31,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : { const sal_Int32 nMask = ReadLongRes(); - if(nMask & RSC_SFX_STYLE_ITEM_LIST) + if(nMask & (sal_uInt32)SfxStyleItem::List) { const sal_Int32 nCount = ReadLongRes(); for( sal_Int32 i = 0; i < nCount; ++i ) @@ -42,26 +42,26 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : aFilterList.push_back( pTupel ); } } - if(nMask & RSC_SFX_STYLE_ITEM_BITMAP) + if(nMask & (sal_uInt32)SfxStyleItem::Bitmap) { aBitmap = Bitmap(ResId(static_cast<RSHEADER_TYPE *>(GetClassRes()),*rResId.GetResMgr())); IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE *>(GetClassRes()) ) ); } - if(nMask & RSC_SFX_STYLE_ITEM_TEXT) + if(nMask & (sal_uInt32)SfxStyleItem::Text) { aText = ReadStringRes(); } - if(nMask & RSC_SFX_STYLE_ITEM_HELPTEXT) + if(nMask & (sal_uInt32)SfxStyleItem::HelpText) { aHelpText = ReadStringRes(); } - if(nMask & RSC_SFX_STYLE_ITEM_STYLEFAMILY) + if(nMask & (sal_uInt32)SfxStyleItem::StyleFamily) { nFamily = static_cast<sal_uInt16>(ReadLongRes()); } else nFamily = SFX_STYLE_FAMILY_PARA; - if(nMask & RSC_SFX_STYLE_ITEM_IMAGE) + if(nMask & (sal_uInt32)SfxStyleItem::Image) { aImage = Image(ResId(static_cast<RSHEADER_TYPE *>(GetClassRes()),*rResId.GetResMgr())); IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE *>(GetClassRes()) ) ); |