diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-23 13:08:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-26 08:29:38 +0200 |
| commit | 69c29c9f895fa58c923af5e6dee1226f8bbfeceb (patch) | |
| tree | 193693f07167525827404d684108677a19f20b75 /sd/source | |
| parent | 594c2b98f8c6c0c03a438e441596ba04e4a66164 (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 'sd/source')
| -rw-r--r-- | sd/source/ui/func/fuolbull.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsf.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 064c6b85ea7a..b4f250d958d1 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -199,7 +199,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq) // get numbering rule corresponding to <nIdx> and apply the needed number formats to <pNumRule> NBOTypeMgrBase* pNumRuleMgr = NBOutlineTypeMgrFact::CreateInstance( - nSId == FN_SVX_SET_BULLET ? eNBOType::BULLETS : eNBOType::NUMBERING ); + nSId == FN_SVX_SET_BULLET ? NBOType::Bullets : NBOType::Numbering ); if ( pNumRuleMgr ) { sal_uInt16 nActNumLvl = (sal_uInt16)0xFFFF; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 12f7ac8b4403..bce88e6b2f54 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -618,7 +618,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put(SfxUInt16Item(FN_NUM_NUM_RULE_INDEX,(sal_uInt16)0xFFFF)); if ( bBullets ) { - NBOTypeMgrBase* pBullets = NBOutlineTypeMgrFact::CreateInstance(eNBOType::BULLETS); + NBOTypeMgrBase* pBullets = NBOutlineTypeMgrFact::CreateInstance(NBOType::Bullets); if ( pBullets ) { sal_uInt16 nBulIndex = pBullets->GetNBOIndexForNumRule(*pNumRule,nActNumLvl); @@ -626,7 +626,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } }else { - NBOTypeMgrBase* pNumbering = NBOutlineTypeMgrFact::CreateInstance(eNBOType::NUMBERING); + NBOTypeMgrBase* pNumbering = NBOutlineTypeMgrFact::CreateInstance(NBOType::Numbering); if ( pNumbering ) { sal_uInt16 nBulIndex = pNumbering->GetNBOIndexForNumRule(*pNumRule,nActNumLvl); |