diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 16:09:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-03 12:13:44 +0000 |
| commit | 1cfedbc960d25ee322b0a0e7aae8dc73758b406e (patch) | |
| tree | 1bcaac3e77e9693f9c3897d7c091acd603aff3fa /svx | |
| parent | f1ea8c43a8ab6b8d158d4d8f3a0039b3a2ac2c37 (diff) | |
drop SvxNumType and rename SvxExtNumType->SvxNumType
Both of them are abstractions over the css::style::NumberingType
constants.
SvxNumType serves no useful purpose, since it's just a typedef to
sal_Int16.
At least SvxExtNumType wraps up the css::style::NumberingType constants
in a nice enum.
Change-Id: I7b3f97cd42b0aa23aff7a4db4930da86149d4f4e
Reviewed-on: https://gerrit.libreoffice.org/34816
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/items/pageitem.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 8 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 5f85d00da589..2796103f1138 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -37,7 +37,7 @@ SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(0);} SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), - eNumType ( css::style::NumberingType::ARABIC ), + eNumType ( SVX_NUM_ARABIC ), bLandscape ( false ), eUse ( SvxPageUsage::All ) { diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 04f9dc1e5f4c..b753deb2b891 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -101,7 +101,7 @@ NumSettings_Impl* lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>& { sal_Int16 nTmp; if (pValues[j].Value >>= nTmp) - pNew->nNumberType = (SvxExtNumType)nTmp; + pNew->nNumberType = (SvxNumType)nTmp; } else if(pValues[j].Name == "Prefix") pValues[j].Value >>= pNew->sPrefix; @@ -547,7 +547,7 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ return; SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); - SvxExtNumType eNumType = aFmt.GetNumberingType(); + SvxNumType eNumType = aFmt.GetNumberingType(); sal_uInt16 nCount = pNumberSettingsArr->size(); if ( nIndex >= nCount ) @@ -583,7 +583,7 @@ void NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uIn NumberSettingsArr_Impl* pCurrentNumberSettingsArr=pNumberSettingsArr; if (isDefault) pCurrentNumberSettingsArr=pDefaultNumberSettingsArr; NumberSettings_Impl* _pSet = (*pCurrentNumberSettingsArr)[nIndex].get(); - SvxExtNumType eNewType = _pSet->pNumSetting->nNumberType; + SvxNumType eNewType = _pSet->pNumSetting->nNumberType; sal_uInt16 nMask = 1; OUString sNumCharFmtName = GetBulCharFmtName(); @@ -785,7 +785,7 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI for (sal_uInt16 iLevel=0;iLevel < nCount;iLevel++) { SvxNumberFormat aFmt(aNum.GetLevel(iLevel)); - SvxExtNumType eNumType = aFmt.GetNumberingType(); + SvxNumType eNumType = aFmt.GetNumberingType(); NumSettings_Impl* _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get(); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 8aeb6b0a7529..7bb15c830f90 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1942,7 +1942,7 @@ void SdrModel::disposeOutliner( SdrOutliner* pOutliner ) SvxNumType SdrModel::GetPageNumType() const { - return css::style::NumberingType::ARABIC; + return SVX_NUM_ARABIC; } void SdrModel::ReadUserDataSequenceValue(const css::beans::PropertyValue* pValue) |