diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-22 15:14:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:38 +0200 |
| commit | ab1b535fb049f4b6354561e60eb027b4cc691a6c (patch) | |
| tree | 291a885c0b57cde97bbb8daafba1ca70ca07cce6 /sw/source/ui | |
| parent | 83ab72efe7dbb9047e89ba2775228b2d81f96bc9 (diff) | |
convert SVX_ flags to scoped enum
Change-Id: I6ca73a459597f06fc301a12d6556775a77a7c4c7
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 41fbe2b8d3b9..a6d8a92ca48a 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1456,7 +1456,7 @@ void SwInsertSectionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) else if (nId == m_nBackPageId) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_SELECTOR)); + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_SELECTOR))); rPage.PageCreated(aSet); } else if (nId == m_nColumnPageId) @@ -2148,7 +2148,7 @@ void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage if (nId == m_nBackPageId) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_SELECTOR)); + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_SELECTOR))); rPage.PageCreated(aSet); } else if (nId == m_nColumnPageId) diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index d8d1aa37b320..d8276160da0c 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -479,14 +479,14 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) // for the SvxBrushItem (see RID_SVXPAGE_BACKGROUND) else if (nId == m_nBackgroundId) { - sal_Int32 nFlagType = 0; + SvxBackgroundTabFlags nFlagType = SvxBackgroundTabFlags::NONE; if( SFX_STYLE_FAMILY_PARA == nType ) - nFlagType |= SVX_SHOW_PARACTL; + nFlagType |= SvxBackgroundTabFlags::SHOW_PARACTL; if( SFX_STYLE_FAMILY_CHAR != nType ) - nFlagType |= SVX_SHOW_SELECTOR; + nFlagType |= SvxBackgroundTabFlags::SHOW_SELECTOR; if( SFX_STYLE_FAMILY_FRAME == nType ) - nFlagType |= SVX_ENABLE_TRANSPARENCY; - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); + nFlagType |= SvxBackgroundTabFlags::ENABLE_TRANSPARENCY; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(nFlagType))); rPage.PageCreated(aSet); } else if (nId == m_nConditionId) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 3eb2ffc4de93..ce78544e1660 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -354,7 +354,7 @@ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) if (nId == m_nBackGroundId) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_SELECTOR)); + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_SELECTOR))); rPage.PageCreated(aSet); } else if(nId == m_nColumnId) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index c76dc0fe477c..a90e84ce9eb7 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1260,8 +1260,8 @@ void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (nId == m_nBackgroundId) { - sal_Int32 nFlagType = SVX_SHOW_TBLCTL | SVX_SHOW_SELECTOR; - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); + SvxBackgroundTabFlags nFlagType = SvxBackgroundTabFlags::SHOW_TBLCTL | SvxBackgroundTabFlags::SHOW_SELECTOR; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(nFlagType))); rPage.PageCreated(aSet); } else if (nId == m_nBorderId) |