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 /sw/source/filter/ww8/ww8par5.cxx | |
| 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 'sw/source/filter/ww8/ww8par5.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 49043b26143a..4e0dfc628290 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -361,10 +361,10 @@ OUString FindPara( const OUString& rStr, sal_Unicode cToken, sal_Unicode cToken2 return rStr.copy( n, n2-n ); } -static SvxExtNumType GetNumTypeFromName(const OUString& rStr, +static SvxNumType GetNumTypeFromName(const OUString& rStr, bool bAllowPageDesc = false) { - SvxExtNumType eTyp = bAllowPageDesc ? SVX_NUM_PAGEDESC : SVX_NUM_ARABIC; + SvxNumType eTyp = bAllowPageDesc ? SVX_NUM_PAGEDESC : SVX_NUM_ARABIC; if( rStr.startsWithIgnoreAsciiCase( "Arabi" ) ) // Arabisch, Arabic eTyp = SVX_NUM_ARABIC; else if( rStr.startsWith( "misch" ) ) // r"omisch @@ -382,10 +382,10 @@ static SvxExtNumType GetNumTypeFromName(const OUString& rStr, return eTyp; } -static SvxExtNumType GetNumberPara(const OUString& rStr, bool bAllowPageDesc = false) +static SvxNumType GetNumberPara(const OUString& rStr, bool bAllowPageDesc = false) { OUString s( FindPara( rStr, '*', '*' ) ); // Ziffernart - SvxExtNumType aType = GetNumTypeFromName( s, bAllowPageDesc ); + SvxNumType aType = GetNumTypeFromName( s, bAllowPageDesc ); return aType; } @@ -1391,7 +1391,7 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, OUString& rStr ) bool bFormat = false; bool bCountOn = true; OUString sStart; - SvxExtNumType eNumFormat = SVX_NUM_ARABIC; + SvxNumType eNumFormat = SVX_NUM_ARABIC; WW8ReadFieldParams aReadParam( rStr ); for (;;) { |