summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-23 13:08:07 +0200
committerNoel Grandin <noel@peralex.com>2016-09-26 08:29:38 +0200
commit69c29c9f895fa58c923af5e6dee1226f8bbfeceb (patch)
tree193693f07167525827404d684108677a19f20b75 /sw/source/uibase
parent594c2b98f8c6c0c03a438e441596ba04e4a66164 (diff)
convert eNBOType constants to scoped enum
and remove unused constants, which means we can remove the GraphicBulletsTypeMgr and MixBulletsTypeMgr classes Change-Id: I395691b48987543355379708e2c60d0de438d72c
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/shells/textsh1.cxx6
-rw-r--r--sw/source/uibase/shells/txtnum.cxx6
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index e48facda7802..918c501e1585 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1844,7 +1844,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
rSet.Put(SfxUInt16Item(FN_BUL_NUM_RULE_INDEX, USHRT_MAX));
rSet.Put(SfxUInt16Item(FN_NUM_NUM_RULE_INDEX, USHRT_MAX));
- NBOTypeMgrBase* pBullets = NBOutlineTypeMgrFact::CreateInstance(eNBOType::BULLETS);
+ NBOTypeMgrBase* pBullets = NBOutlineTypeMgrFact::CreateInstance(NBOType::Bullets);
if ( pBullets )
{
const sal_uInt16 nBulIndex = pBullets->GetNBOIndexForNumRule(aSvxRule,nActNumLvl);
@@ -1854,7 +1854,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
rSet.Put(SfxUInt16Item(FN_BUL_NUM_RULE_INDEX, USHRT_MAX));
rSet.Put(SfxUInt16Item(FN_NUM_NUM_RULE_INDEX, USHRT_MAX));
- NBOTypeMgrBase* pNumbering = NBOutlineTypeMgrFact::CreateInstance(eNBOType::NUMBERING);
+ NBOTypeMgrBase* pNumbering = NBOutlineTypeMgrFact::CreateInstance(NBOType::Numbering);
if ( pNumbering )
{
const sal_uInt16 nBulIndex = pNumbering->GetNBOIndexForNumRule(aSvxRule,nActNumLvl);
@@ -1865,7 +1865,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
if ( nWhich == FN_OUTLINE_RULE_INDEX )
{
rSet.Put(SfxUInt16Item(FN_OUTLINE_RULE_INDEX, USHRT_MAX));
- NBOTypeMgrBase* pOutline = NBOutlineTypeMgrFact::CreateInstance(eNBOType::OUTLINE);
+ NBOTypeMgrBase* pOutline = NBOutlineTypeMgrFact::CreateInstance(NBOType::Outline);
if ( pOutline )
{
const sal_uInt16 nIndex = pOutline->GetNBOIndexForNumRule(aSvxRule,nActNumLvl);
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index bf159472b88d..fa346dbc9479 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -252,11 +252,11 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq)
if ( pItem != nullptr )
{
const sal_uInt16 nChoosenItemIdx = pItem->GetValue();
- sal_uInt16 nNBOType = svx::sidebar::eNBOType::BULLETS;
+ svx::sidebar::NBOType nNBOType = svx::sidebar::NBOType::Bullets;
if ( nSlot == FN_SVX_SET_NUMBER )
- nNBOType = svx::sidebar::eNBOType::NUMBERING;
+ nNBOType = svx::sidebar::NBOType::Numbering;
else if ( nSlot == FN_SVX_SET_OUTLINE )
- nNBOType = svx::sidebar::eNBOType::OUTLINE;
+ nNBOType = svx::sidebar::NBOType::Outline;
svx::sidebar::NBOTypeMgrBase* pNBOTypeMgr = svx::sidebar::NBOutlineTypeMgrFact::CreateInstance( nNBOType );