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/uibase | |
| 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/uibase')
| -rw-r--r-- | sw/source/uibase/inc/numberingtypelistbox.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/misc/numberingtypelistbox.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/shells/txtnum.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/uitool.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index ae78b20f0e5b..741447cbc994 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -52,8 +52,8 @@ public: void Reload(SwInsertNumTypes nTypeFlags); - SvxExtNumType GetSelectedNumberingType(); - bool SelectNumberingType(SvxExtNumType nType); + SvxNumType GetSelectedNumberingType(); + bool SelectNumberingType(SvxNumType nType); }; #endif diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 7d9362aebcef..d66ac3e1963f 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -165,12 +165,12 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) } } -SvxExtNumType SwNumberingTypeListBox::GetSelectedNumberingType() +SvxNumType SwNumberingTypeListBox::GetSelectedNumberingType() { - SvxExtNumType nRet = SVX_NUM_CHARS_UPPER_LETTER; + SvxNumType nRet = SVX_NUM_CHARS_UPPER_LETTER; sal_Int32 nSelPos = GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nSelPos) - nRet = (SvxExtNumType)reinterpret_cast<sal_uLong>(GetEntryData(nSelPos)); + nRet = (SvxNumType)reinterpret_cast<sal_uLong>(GetEntryData(nSelPos)); #if OSL_DEBUG_LEVEL > 0 else OSL_FAIL("SwNumberingTypeListBox not selected"); @@ -178,7 +178,7 @@ SvxExtNumType SwNumberingTypeListBox::GetSelectedNumberingType() return nRet; } -bool SwNumberingTypeListBox::SelectNumberingType(SvxExtNumType nType) +bool SwNumberingTypeListBox::SelectNumberingType(SvxNumType nType) { sal_Int32 nPos = GetEntryPos(reinterpret_cast<void*>((sal_uLong)nType)); SelectEntryPos( nPos ); diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index ff8f60ba4c25..c8add14f68e5 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -128,7 +128,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) { const SvxBrushItem* pBrush = aFormat.GetBrush(); if(pBrush && !pBrush->GetGraphicLink().isEmpty()) - aFormat.SetNumberingType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN)); + aFormat.SetNumberingType(SvxNumType(SVX_NUM_BITMAP|LINK_TOKEN)); aRule.SetLevel(i, aFormat, aRule.Get(i) != nullptr); } } diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 7907b88d5341..6f4c20ae016b 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -281,7 +281,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rPageDesc.SetUseOn( lcl_convertUseFromSvx(nUse) ); rPageDesc.SetLandscape(rPageItem.IsLandscape()); SvxNumberType aNumType; - aNumType.SetNumberingType( (SvxExtNumType)rPageItem.GetNumType() ); + aNumType.SetNumberingType( rPageItem.GetNumType() ); rPageDesc.SetNumType(aNumType); } // Size |