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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/inc/numpages.hxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 8 | ||||
| -rw-r--r-- | cui/source/tabpages/page.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 4894293ede51..bb30cbd3d751 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -66,8 +66,8 @@ class SvxNumberingPreview : public vcl::Window struct SvxNumSettings_Impl { - SvxExtNumType nNumberType; - short nParentNumbering; + SvxNumType nNumberType; + short nParentNumbering; OUString sPrefix; OUString sSuffix; OUString sBulletChar; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 679a5ff77f03..7ebc6d171d29 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -114,7 +114,7 @@ static SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const Sequence<PropertyValu { 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; @@ -330,7 +330,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) if(aNumSettingsArr.size() <= nIdx) return; SvxNumSettings_Impl* _pSet = aNumSettingsArr[nIdx].get(); - SvxExtNumType eNewType = _pSet->nNumberType; + SvxNumType eNewType = _pSet->nNumberType; const sal_Unicode cLocalPrefix = !_pSet->sPrefix.isEmpty() ? _pSet->sPrefix[0] : 0; const sal_Unicode cLocalSuffix = !_pSet->sSuffix.isEmpty() ? _pSet->sSuffix[0] : 0; @@ -949,7 +949,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) sal_uInt16 nIdx = m_pExamplesVS->GetSelectItemId() - 1; sal_uInt16 nMask = 1; - SvxExtNumType nSetNumberingType = SVX_NUM_BITMAP; + SvxNumType nSetNumberingType = SVX_NUM_BITMAP; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) @@ -1784,7 +1784,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); // PAGEDESC does not exist - SvxExtNumType nNumType = (SvxExtNumType)reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); + SvxNumType nNumType = (SvxNumType)reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); aNumFmt.SetNumberingType(nNumType); sal_uInt16 nNumberingType = aNumFmt.GetNumberingType(); if(SVX_NUM_BITMAP == (nNumberingType&(~LINK_TOKEN))) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 1b99f638094f..81b367bfeeb1 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -466,7 +466,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) } // general page data - SvxNumType eNumType = css::style::NumberingType::ARABIC; + SvxNumType eNumType = SVX_NUM_ARABIC; bLandscape = ( mpDefPrinter->GetOrientation() == Orientation::Landscape ); SvxPageUsage nUse = SvxPageUsage::All; pItem = GetItem( *rSet, SID_ATTR_PAGE ); |