diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-25 14:42:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-26 09:41:34 +0200 |
commit | 44101b295071484f4797a9d3140e5ea1a42bc431 (patch) | |
tree | 0cb68ab8840fdeb581fd5cba8b25640088fff731 /sd | |
parent | 0fb66458c08b9c0ce59bca85e77d26fad8b59e4b (diff) |
convert NUM_ constants to enum clas
Change-Id: Id41ea91aaf618c7f3f323698c09caa7c8df2290a
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/stlpool.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/dlg/dlgolbul.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fuolbull.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 1c2b66cd069a..881ccc05b527 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1221,7 +1221,7 @@ void SdDrawDocument::SetTextDefaults() const aNumberFormat.SetStart(1); aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT); - SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, SVX_MAX_NUM, false); + SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, SVX_MAX_NUM, false); //aNumberFormat.SetAbsLSpace( 0 ); //aNumberFormat.SetFirstLineOffset( 0 ); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 564d7d323de5..d427b831f446 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1107,7 +1107,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumberFormat.SetStart(1); aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT); - SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, SVX_MAX_NUM, false); + SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, SVX_MAX_NUM, false); for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ ) { @@ -1161,7 +1161,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumberFormat.SetStart(1); aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT); - SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE|NUM_SYMBOL_ALIGNMENT, + SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR | + SvxNumRuleFlags::CHAR_TEXT_DISTANCE | SvxNumRuleFlags::SYMBOL_ALIGNMENT, SVX_MAX_NUM, false ); for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ ) { diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 4dd28b99a41b..c3a77103b247 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -116,7 +116,7 @@ OutlineBulletDlg::OutlineBulletDlg( if(pRule) { SvxNumRule aNewRule( *pRule ); - aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, true ); + aNewRule.SetFeatureFlag( SvxNumRuleFlags::NO_NUMBERS, true ); SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); aInputSet.Put(aNewItem); @@ -183,7 +183,7 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const const SvxNumBulletItem* pBulletItem = static_cast<const SvxNumBulletItem*>(pOutputSet->GetItem(EE_PARA_NUMBULLET,true)); SvxNumRule* pRule = pBulletItem->GetNumRule(); if(pRule) - pRule->SetFeatureFlag( NUM_NO_NUMBERS, false ); + pRule->SetFeatureFlag( SvxNumRuleFlags::NO_NUMBERS, false ); } return pOutputSet; diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 55acf20100a1..2ee2ddb3d459 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -366,7 +366,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u if(pLclRule) { SvxNumRule aNewRule( *pLclRule ); - aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, true ); + aNewRule.SetFeatureFlag( SvxNumRuleFlags::NO_NUMBERS, true ); SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); aNewAttr.Put(aNewItem); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index ce01af2ac0f5..feb3b11973c8 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -815,7 +815,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& if(pRule) { SvxNumRule aNewRule( *pRule ); - aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, true ); + aNewRule.SetFeatureFlag( SvxNumRuleFlags::NO_NUMBERS, true ); SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); aNewAttr.Put(aNewItem); |