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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/items/numitem.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/uno/unonrule.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index d17a146959e7..54eef3e96bef 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -78,7 +78,7 @@ static void lcl_getFormatter(css::uno::Reference<css::text::XNumberingFormatter> } } -SvxNumberType::SvxNumberType(SvxExtNumType nType) : +SvxNumberType::SvxNumberType(SvxNumType nType) : nNumType(nType), bShowSymbol(true) { @@ -147,7 +147,7 @@ OUString SvxNumberType::GetNumStr( sal_uLong nNo, const css::lang::Locale& rLoca return OUString(); } -SvxNumberFormat::SvxNumberFormat( SvxExtNumType eType, +SvxNumberFormat::SvxNumberFormat( SvxNumType eType, SvxNumPositionAndSpaceMode ePositionAndSpaceMode ) : SvxNumberType(eType), eNumAdjust(SVX_ADJUST_LEFT), @@ -190,7 +190,7 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream ) sal_Int32 nTmp32(0); rStream.ReadUInt16( nTmp16 ); // Version number - rStream.ReadUInt16( nTmp16 ); SetNumberingType( (SvxExtNumType)nTmp16 ); + rStream.ReadUInt16( nTmp16 ); SetNumberingType( (SvxNumType)nTmp16 ); rStream.ReadUInt16( nTmp16 ); eNumAdjust = ( SvxAdjust )nTmp16; rStream.ReadUInt16( nTmp16 ); nInclUpperLevels = nTmp16; rStream.ReadUInt16( nStart ); diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 4573b9001259..051c1f71d7d5 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -282,7 +282,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert // There is no reason to limit numbering types. if ( nSet>=0 ) { - aFmt.SetNumberingType((SvxExtNumType)nSet); + aFmt.SetNumberingType((SvxNumType)nSet); continue; } } |