diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 14:24:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-03 06:45:05 +0000 |
| commit | afa675469cd9894f41a6b9eeb2e7acc8245d256c (patch) | |
| tree | ce8bcab207aef1534298b2369accc4ada5597b08 /svx/source | |
| parent | f091259ad2ec1590714645839668580cd7b8c7c4 (diff) | |
use SvxExtNumType in SvxNumberType
and follow the rabbit trail, fixing various other types in the process
Change-Id: I8fc7df3b585df21578ffb28fdd7e5e427b3bfd9d
Reviewed-on: https://gerrit.libreoffice.org/34814
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index ac95d7b86381..04f9dc1e5f4c 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -98,7 +98,11 @@ NumSettings_Impl* lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>& for(sal_Int32 j = 0; j < rLevelProps.getLength(); j++) { if(pValues[j].Name == "NumberingType") - pValues[j].Value >>= pNew->nNumberType; + { + sal_Int16 nTmp; + if (pValues[j].Value >>= nTmp) + pNew->nNumberType = (SvxExtNumType)nTmp; + } else if(pValues[j].Name == "Prefix") pValues[j].Value >>= pNew->sPrefix; else if(pValues[j].Name == "Suffix") @@ -543,7 +547,7 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ return; SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); - sal_Int16 eNumType = aFmt.GetNumberingType(); + SvxExtNumType eNumType = aFmt.GetNumberingType(); sal_uInt16 nCount = pNumberSettingsArr->size(); if ( nIndex >= nCount ) @@ -579,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(); - sal_Int16 eNewType = _pSet->pNumSetting->nNumberType; + SvxExtNumType eNewType = _pSet->pNumSetting->nNumberType; sal_uInt16 nMask = 1; OUString sNumCharFmtName = GetBulCharFmtName(); @@ -781,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)); - sal_Int16 eNumType = aFmt.GetNumberingType(); + SvxExtNumType eNumType = aFmt.GetNumberingType(); NumSettings_Impl* _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get(); |