[Libreoffice-commits] core.git: cui/source editeng/source include/editeng include/svx oox/source reportdesign/source sc/source sd/source svx/source sw/inc sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Mar 3 12:14:32 UTC 2017
cui/source/inc/numpages.hxx | 4 +--
cui/source/tabpages/numpages.cxx | 8 +++---
cui/source/tabpages/page.cxx | 2 -
editeng/source/items/numitem.cxx | 6 ++--
editeng/source/uno/unonrule.cxx | 2 -
include/editeng/numitem.hxx | 10 +++----
include/editeng/svxenum.hxx | 2 -
include/svx/nbdtmg.hxx | 2 -
include/svx/pageitem.hxx | 5 +--
oox/source/export/drawingml.cxx | 6 ++--
reportdesign/source/core/sdr/RptModel.cxx | 4 +--
reportdesign/source/ui/report/ReportController.cxx | 2 -
sc/source/core/tool/editutil.cxx | 2 -
sc/source/filter/starcalc/scflt.cxx | 2 -
sd/source/core/drawdoc.cxx | 2 -
sd/source/filter/eppt/pptx-text.cxx | 2 -
sd/source/filter/eppt/text.hxx | 6 ++--
svx/source/items/pageitem.cxx | 2 -
svx/source/sidebar/nbdtmg.cxx | 8 +++---
svx/source/svdraw/svdmodel.cxx | 2 -
sw/inc/docufld.hxx | 12 ++++-----
sw/inc/fldbas.hxx | 4 +--
sw/inc/fmtftntx.hxx | 4 +--
sw/source/core/access/accframe.cxx | 2 -
sw/source/core/edit/autofmt.cxx | 4 +--
sw/source/core/fields/dbfld.cxx | 2 -
sw/source/core/fields/docufld.cxx | 28 ++++++++++-----------
sw/source/core/fields/expfld.cxx | 2 -
sw/source/core/fields/fldbas.cxx | 2 -
sw/source/core/layout/atrfrm.cxx | 2 -
sw/source/core/text/txtfld.cxx | 4 +--
sw/source/core/unocore/unosett.cxx | 8 +++---
sw/source/filter/html/htmlfld.cxx | 10 +++----
sw/source/filter/html/htmlfldw.cxx | 4 +--
sw/source/filter/html/svxcss1.cxx | 2 -
sw/source/filter/html/svxcss1.hxx | 2 -
sw/source/filter/html/swhtml.hxx | 2 -
sw/source/filter/ww8/ww8par.cxx | 2 -
sw/source/filter/ww8/ww8par2.cxx | 4 +--
sw/source/filter/ww8/ww8par3.cxx | 2 -
sw/source/filter/ww8/ww8par5.cxx | 10 +++----
sw/source/filter/ww8/ww8par6.cxx | 2 -
sw/source/ui/misc/linenum.cxx | 2 -
sw/source/ui/misc/outline.cxx | 2 -
sw/source/uibase/inc/numberingtypelistbox.hxx | 4 +--
sw/source/uibase/misc/numberingtypelistbox.cxx | 8 +++---
sw/source/uibase/shells/txtnum.cxx | 2 -
sw/source/uibase/utlui/uitool.cxx | 2 -
48 files changed, 106 insertions(+), 107 deletions(-)
New commits:
commit 1cfedbc960d25ee322b0a0e7aae8dc73758b406e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Mar 2 16:09:36 2017 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 4894293..bb30cbd 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 679a5ff..7ebc6d1 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 1b99f63..81b367b 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 );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index d17a146..54eef3e 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 4573b90..051c1f7 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;
}
}
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 16fd8df..a417029 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -55,19 +55,19 @@ class EDITENG_DLLPUBLIC SvxNumberType
static sal_Int32 nRefCount;
static css::uno::Reference<css::text::XNumberingFormatter> xFormatter;
- SvxExtNumType nNumType;
+ SvxNumType nNumType;
bool bShowSymbol; // Also show Symbol ?
public:
- explicit SvxNumberType(SvxExtNumType nType = SVX_NUM_ARABIC);
+ explicit SvxNumberType(SvxNumType nType = SVX_NUM_ARABIC);
SvxNumberType(const SvxNumberType& rType);
~SvxNumberType();
OUString GetNumStr( sal_uLong nNo ) const;
OUString GetNumStr( sal_uLong nNo, const css::lang::Locale& rLocale ) const;
- void SetNumberingType(SvxExtNumType nSet) {nNumType = nSet;}
- SvxExtNumType GetNumberingType() const {return nNumType;}
+ void SetNumberingType(SvxNumType nSet) {nNumType = nSet;}
+ SvxNumType GetNumberingType() const {return nNumType;}
void SetShowSymbol(bool bSet) {bShowSymbol = bSet;}
bool IsShowSymbol()const{return bShowSymbol;}
@@ -142,7 +142,7 @@ private:
OUString sCharStyleName; // Character Style
public:
- explicit SvxNumberFormat( SvxExtNumType nNumberingType,
+ explicit SvxNumberFormat( SvxNumType nNumberingType,
SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
SvxNumberFormat(const SvxNumberFormat& rFormat);
SvxNumberFormat( SvStream & rStream );
diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index de42680..3f8e47c 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -149,7 +149,7 @@ enum class SvxSpellArea
/**
* these must match the values in css::style::NumberingType
*/
-enum SvxExtNumType
+enum SvxNumType
{
SVX_NUM_CHARS_UPPER_LETTER = css::style::NumberingType::CHARS_UPPER_LETTER, // Counts from a-z, aa - az, ba - bz, ...
SVX_NUM_CHARS_LOWER_LETTER = css::style::NumberingType::CHARS_LOWER_LETTER,
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index f1cd4de..992bd83 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -43,7 +43,7 @@ enum class NBType
class SVX_DLLPUBLIC NumSettings_Impl
{
public:
- SvxExtNumType nNumberType;
+ SvxNumType nNumberType;
short nParentNumbering;
SvxNumberFormat::LabelFollowedBy eLabelFollowedBy;
long nTabValue;
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 5849473..0a322a6 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -21,8 +21,7 @@
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
-
-using SvxNumType = sal_Int16; // css::style::NumberingType constants
+#include <editeng/svxenum.hxx>
/*--------------------------------------------------------------------
usage of the page
@@ -50,7 +49,7 @@ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem
{
private:
OUString aDescName; // name of the template
- SvxNumType eNumType; // enumeration
+ SvxNumType eNumType;
bool bLandscape; // Portrait / Landscape
SvxPageUsage eUse; // Layout
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 9b2b8bb..36c460a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1656,7 +1656,7 @@ void DrawingML::WriteRun( const Reference< XTextRange >& rRun )
mpFS->endElementNS( XML_a, XML_r );
}
-OUString GetAutoNumType(SvxExtNumType nNumberingType, bool bSDot, bool bPBehind, bool bPBoth)
+OUString GetAutoNumType(SvxNumType nNumberingType, bool bSDot, bool bPBehind, bool bPBoth)
{
OUString sPrefixSuffix;
@@ -1719,7 +1719,7 @@ void DrawingML::WriteParagraphNumbering( const Reference< XPropertySet >& rXProp
const PropertyValue* pPropValue = aPropertySequence.getArray();
- SvxExtNumType nNumberingType = SVX_NUM_NUMBER_NONE;
+ SvxNumType nNumberingType = SVX_NUM_NUMBER_NONE;
bool bSDot = false;
bool bPBehind = false;
bool bPBoth = false;
@@ -1738,7 +1738,7 @@ void DrawingML::WriteParagraphNumbering( const Reference< XPropertySet >& rXProp
SAL_INFO("oox.shape", "pro name: " << aPropName);
if ( aPropName == "NumberingType" )
{
- nNumberingType = (SvxExtNumType)*o3tl::doAccess<sal_Int16>(pPropValue[i].Value);
+ nNumberingType = (SvxNumType)*o3tl::doAccess<sal_Int16>(pPropValue[i].Value);
}
else if ( aPropName == "Prefix" )
{
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index aca7a76..2f13ee7 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -121,8 +121,8 @@ SvxNumType OReportModel::GetPageNumType() const
{
uno::Reference< report::XReportDefinition > xReportDefinition( getReportDefinition() );
if ( xReportDefinition.is() )
- return getStyleProperty<sal_Int16>(xReportDefinition,PROPERTY_NUMBERINGTYPE);
- return css::style::NumberingType::ARABIC;
+ return (SvxNumType) getStyleProperty<sal_Int16>(xReportDefinition,PROPERTY_NUMBERINGTYPE);
+ return SVX_NUM_ARABIC;
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index d8cd184..3fdf00a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2445,7 +2445,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
uno::Reference<beans::XPropertySet> xProp(xPageStyle,uno::UNO_QUERY_THROW);
aPageItem.PutValue(xProp->getPropertyValue(PROPERTY_PAGESTYLELAYOUT),MID_PAGE_LAYOUT);
aPageItem.SetLandscape(getStyleProperty<bool>(m_xReportDefinition,PROPERTY_ISLANDSCAPE));
- aPageItem.SetNumType(getStyleProperty<sal_Int16>(m_xReportDefinition,PROPERTY_NUMBERINGTYPE));
+ aPageItem.SetNumType((SvxNumType)getStyleProperty<sal_Int16>(m_xReportDefinition,PROPERTY_NUMBERINGTYPE));
pDescriptor->Put(aPageItem);
pDescriptor->Put(SvxBrushItem(::Color(getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BACKCOLOR)),RPTUI_ID_BRUSH));
}
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index e820f11..37dc4e5 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -787,7 +787,7 @@ ScHeaderFieldData::ScHeaderFieldData()
aTime( tools::Time::EMPTY )
{
nPageNo = nTotalPages = 0;
- eNumType = css::style::NumberingType::ARABIC;
+ eNumType = SVX_NUM_ARABIC;
}
ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP )
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 27c2a34..e167882 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -861,7 +861,7 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
SvxPageItem aPageItem(ATTR_PAGE);
aPageItem.SetPageUsage( SvxPageUsage::All );
aPageItem.SetLandscape( pPage->Orientation != 1 );
- aPageItem.SetNumType( css::style::NumberingType::ARABIC );
+ aPageItem.SetNumType( SVX_NUM_ARABIC );
pSet->Put(aPageItem);
pSet->Put(SvxLRSpaceItem( pPage->Left, pPage->Right, 0,0, ATTR_LRSPACE ));
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 3868bd8..3a4a86e 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -168,7 +168,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
, meLanguage( LANGUAGE_SYSTEM )
, meLanguageCJK( LANGUAGE_SYSTEM )
, meLanguageCTL( LANGUAGE_SYSTEM )
-, mePageNumType(css::style::NumberingType::ARABIC)
+, mePageNumType(SVX_NUM_ARABIC)
, mbAllocDocSh(false)
, meDocType(eType)
, mpCharClass(nullptr)
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index b2f92b4..58fb320 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -821,7 +821,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1
{
OUString aPropName( pPropValue[ i ].Name );
if ( aPropName == "NumberingType" )
- nNumberingType = (SvxExtNumType)*o3tl::doAccess<sal_Int16>(pPropValue[i].Value);
+ nNumberingType = (SvxNumType)*o3tl::doAccess<sal_Int16>(pPropValue[i].Value);
else if ( aPropName == "Adjust" )
nHorzAdjust = *o3tl::doAccess<sal_Int16>(pPropValue[i].Value);
else if ( aPropName == "BulletChar" )
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index efa8d4f..d215a80 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -39,14 +39,14 @@ namespace style { struct TabStop; }
struct SOParagraph
{
- bool bExtendedParameters;
+ bool bExtendedParameters;
sal_uInt32 nParaFlags;
sal_Int16 nBulletFlags;
OUString sPrefix;
OUString sSuffix;
OUString sGraphicUrl; // String to a graphic
Size aBuGraSize;
- SvxExtNumType nNumberingType;
+ SvxNumType nNumberingType;
sal_uInt32 nHorzAdjust;
sal_uInt32 nBulletColor;
sal_Int32 nBulletOfs;
@@ -55,7 +55,7 @@ struct SOParagraph
sal_Int16 nBulletRealSize; // scale in percent
sal_Int16 nDepth; // actual depth
sal_Unicode cBulletId; // if Numbering Type == CharSpecial
- css::awt::FontDescriptor aFontDesc;
+ css::awt::FontDescriptor aFontDesc;
bool bExtendedBulletsUsed;
sal_uInt16 nBulletId;
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 5f85d00..2796103 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -37,7 +37,7 @@ SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(0);}
SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
- eNumType ( css::style::NumberingType::ARABIC ),
+ eNumType ( SVX_NUM_ARABIC ),
bLandscape ( false ),
eUse ( SvxPageUsage::All )
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 04f9dc1..b753deb 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -101,7 +101,7 @@ NumSettings_Impl* lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>&
{
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;
@@ -547,7 +547,7 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_
return;
SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
- SvxExtNumType eNumType = aFmt.GetNumberingType();
+ SvxNumType eNumType = aFmt.GetNumberingType();
sal_uInt16 nCount = pNumberSettingsArr->size();
if ( nIndex >= nCount )
@@ -583,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();
- SvxExtNumType eNewType = _pSet->pNumSetting->nNumberType;
+ SvxNumType eNewType = _pSet->pNumSetting->nNumberType;
sal_uInt16 nMask = 1;
OUString sNumCharFmtName = GetBulCharFmtName();
@@ -785,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));
- SvxExtNumType eNumType = aFmt.GetNumberingType();
+ SvxNumType eNumType = aFmt.GetNumberingType();
NumSettings_Impl* _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 8aeb6b0..7bb15c8 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1942,7 +1942,7 @@ void SdrModel::disposeOutliner( SdrOutliner* pOutliner )
SvxNumType SdrModel::GetPageNumType() const
{
- return css::style::NumberingType::ARABIC;
+ return SVX_NUM_ARABIC;
}
void SdrModel::ReadUserDataSequenceValue(const css::beans::PropertyValue* pValue)
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 1d451f2..b55fb6f 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -125,16 +125,16 @@ enum SwJumpEditFormat
class SwPageNumberFieldType : public SwFieldType
{
- SvxExtNumType nNumberingType;
+ SvxNumType nNumberingType;
bool bVirtuell;
public:
SwPageNumberFieldType();
- OUString Expand( SvxExtNumType nFormat, short nOff, sal_uInt16 const nPageNumber,
+ OUString Expand( SvxNumType nFormat, short nOff, sal_uInt16 const nPageNumber,
sal_uInt16 const nMaxPage, const OUString& ) const;
void ChangeExpansion( SwDoc* pDoc,
- bool bVirtPageNum, const SvxExtNumType* pNumFormat );
+ bool bVirtPageNum, const SvxNumType* pNumFormat );
virtual SwFieldType* Copy() const override;
};
@@ -247,14 +247,14 @@ public:
class SwDocStatFieldType : public SwFieldType
{
SwDoc* pDoc;
- SvxExtNumType nNumberingType;
+ SvxNumType nNumberingType;
public:
SwDocStatFieldType(SwDoc*);
- OUString Expand(sal_uInt16 nSubType, SvxExtNumType nFormat) const;
+ OUString Expand(sal_uInt16 nSubType, SvxNumType nFormat) const;
virtual SwFieldType* Copy() const override;
- inline void SetNumFormat( SvxExtNumType eFormat ) { nNumberingType = eFormat; }
+ inline void SetNumFormat( SvxNumType eFormat ) { nNumberingType = eFormat; }
};
class SW_DLLPUBLIC SwDocStatField : public SwField
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 5fbbbd3..35988c4 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -218,7 +218,7 @@ enum SwDateTimeSubType {
};
/// General tools.
-OUString FormatNumber(sal_uInt32 nNum, SvxExtNumType nFormat);
+OUString FormatNumber(sal_uInt32 nNum, SvxNumType nFormat);
/** Instances of SwFields and those derived from it occur 0 to n times.
For each class there is one instance of the associated type class.
@@ -278,7 +278,7 @@ private:
bool m_bUseFieldValueCache; /// control the usage of the cached field value
sal_uInt16 m_nLang; ///< Always change via SetLanguage!
bool m_bIsAutomaticLanguage;
- sal_uInt32 m_nFormat; /// this can be either SvxExtNumType or SwChapterFormat depending on the subtype
+ sal_uInt32 m_nFormat; /// this can be either SvxNumType or SwChapterFormat depending on the subtype
SwFieldType* m_pType;
virtual OUString Expand() const = 0;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 30b9ff7..c2bc8cf 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -69,8 +69,8 @@ public:
SwFormatFootnoteEndAtTextEnd & operator=( const SwFormatFootnoteEndAtTextEnd & rAttr );
- SvxExtNumType GetNumType() const { return aFormat.GetNumberingType(); }
- void SetNumType( SvxExtNumType eType ) { aFormat.SetNumberingType(eType); }
+ SvxNumType GetNumType() const { return aFormat.GetNumberingType(); }
+ void SetNumType( SvxNumType eType ) { aFormat.SetNumberingType(eType); }
const SvxNumberType& GetSwNumType() const { return aFormat; }
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 1fd9bbf..6133af4 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -433,7 +433,7 @@ const SwFrame* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrameOrOb
OUString SwAccessibleFrame::GetFormattedPageNumber() const
{
sal_uInt16 nPageNum = GetFrame()->GetVirtPageNum();
- SvxExtNumType nFormat = GetFrame()->FindPageFrame()->GetPageDesc()
+ SvxNumType nFormat = GetFrame()->FindPageFrame()->GetPageDesc()
->GetNumType().GetNumberingType();
if( SVX_NUM_NUMBER_NONE == nFormat )
nFormat = SVX_NUM_ARABIC;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 53db60f..168a083 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1532,7 +1532,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
aFormat.SetCharFormat( pCFormat );
if( !aNumTypes.isEmpty() )
- aFormat.SetNumberingType((SvxExtNumType)(aNumTypes[ 0 ] - '0'));
+ aFormat.SetNumberingType((SvxNumType)(aNumTypes[ 0 ] - '0'));
if( bRTL )
aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
@@ -1553,7 +1553,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
aFormat.SetSuffix( aPostfix.getToken( n, (sal_Unicode)1 ));
aFormat.SetIncludeUpperLevels( MAXLEVEL );
if( n < aNumTypes.getLength() )
- aFormat.SetNumberingType((SvxExtNumType)(aNumTypes[ n ] - '0'));
+ aFormat.SetNumberingType((SvxNumType)(aNumTypes[ n ] - '0'));
aFormat.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
+ lNumIndent );
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 3c64888..beea51a 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -817,7 +817,7 @@ OUString SwDBSetNumberField::Expand() const
{
if(0 !=(GetSubType() & nsSwExtendedSubType::SUB_INVISIBLE) || nNumber == 0)
return OUString();
- return FormatNumber(nNumber, (SvxExtNumType)GetFormat());
+ return FormatNumber(nNumber, (SvxNumType)GetFormat());
}
void SwDBSetNumberField::Evaluate(SwDoc* pDoc)
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 4b17a5f..912a810 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -103,11 +103,11 @@ SwPageNumberFieldType::SwPageNumberFieldType()
{
}
-OUString SwPageNumberFieldType::Expand( SvxExtNumType nFormat, short nOff,
+OUString SwPageNumberFieldType::Expand( SvxNumType nFormat, short nOff,
sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage,
const OUString& rUserStr ) const
{
- SvxExtNumType nTmpFormat = (SVX_NUM_PAGEDESC == nFormat) ? nNumberingType : nFormat;
+ SvxNumType nTmpFormat = (SVX_NUM_PAGEDESC == nFormat) ? nNumberingType : nFormat;
int const nTmp = nPageNumber + nOff;
if (0 > nTmp || SVX_NUM_NUMBER_NONE == nTmpFormat || (!bVirtuell && nTmp > nMaxPage))
@@ -131,7 +131,7 @@ SwFieldType* SwPageNumberFieldType::Copy() const
void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
bool bVirt,
- const SvxExtNumType* pNumFormat )
+ const SvxNumType* pNumFormat )
{
if( pNumFormat )
nNumberingType = *pNumFormat;
@@ -188,22 +188,22 @@ OUString SwPageNumberField::Expand() const
if( PG_NEXT == nSubType && 1 != nOffset )
{
- sRet = pFieldType->Expand((SvxExtNumType)GetFormat(), 1, m_nPageNumber, m_nMaxPage, sUserStr);
+ sRet = pFieldType->Expand((SvxNumType)GetFormat(), 1, m_nPageNumber, m_nMaxPage, sUserStr);
if (!sRet.isEmpty())
{
- sRet = pFieldType->Expand((SvxExtNumType)GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+ sRet = pFieldType->Expand((SvxNumType)GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
}
}
else if( PG_PREV == nSubType && -1 != nOffset )
{
- sRet = pFieldType->Expand((SvxExtNumType)GetFormat(), -1, m_nPageNumber, m_nMaxPage, sUserStr);
+ sRet = pFieldType->Expand((SvxNumType)GetFormat(), -1, m_nPageNumber, m_nMaxPage, sUserStr);
if (!sRet.isEmpty())
{
- sRet = pFieldType->Expand((SvxExtNumType)GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+ sRet = pFieldType->Expand((SvxNumType)GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
}
}
else
- sRet = pFieldType->Expand((SvxExtNumType)GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+ sRet = pFieldType->Expand((SvxNumType)GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
return sRet;
}
@@ -720,7 +720,7 @@ SwDocStatFieldType::SwDocStatFieldType(SwDoc* pDocument)
pDoc = pDocument;
}
-OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, SvxExtNumType nFormat) const
+OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, SvxNumType nFormat) const
{
sal_uInt32 nVal = 0;
const SwDocStat& rDStat = pDoc->getIDocumentStatistics().GetDocStat();
@@ -767,7 +767,7 @@ SwDocStatField::SwDocStatField(SwDocStatFieldType* pTyp, sal_uInt16 nSub, sal_uI
OUString SwDocStatField::Expand() const
{
- return static_cast<SwDocStatFieldType*>(GetTyp())->Expand(nSubType, (SvxExtNumType)GetFormat());
+ return static_cast<SwDocStatFieldType*>(GetTyp())->Expand(nSubType, (SvxNumType)GetFormat());
}
SwField* SwDocStatField::Copy() const
@@ -2165,11 +2165,11 @@ void SwRefPageGetFieldType::UpdateField( SwTextField* pTextField,
pRefFrame->FindPageFrame()->GetPhyPageNum() + 1
: 1;
- SvxExtNumType nTmpFormat = SVX_NUM_PAGEDESC == (SvxExtNumType)pGetField->GetFormat()
+ SvxNumType nTmpFormat = SVX_NUM_PAGEDESC == (SvxNumType)pGetField->GetFormat()
? ( !pPgFrame
? SVX_NUM_ARABIC
: pPgFrame->GetPageDesc()->GetNumType().GetNumberingType() )
- : (SvxExtNumType)pGetField->GetFormat();
+ : (SvxNumType)pGetField->GetFormat();
const short nPageNum = std::max<short>(0, pSetField->GetOffset() + nDiff);
pGetField->SetText( FormatNumber( nPageNum, nTmpFormat ) );
}
@@ -2249,9 +2249,9 @@ void SwRefPageGetField::ChangeExpansion( const SwFrame* pFrame,
pRefFrame->FindPageFrame()->GetPhyPageNum() + 1;
SwRefPageGetField* pGetField = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pField->GetFormatField().GetField()));
- SvxExtNumType nTmpFormat = SVX_NUM_PAGEDESC == pGetField->GetFormat()
+ SvxNumType nTmpFormat = SVX_NUM_PAGEDESC == pGetField->GetFormat()
? pPgFrame->GetPageDesc()->GetNumType().GetNumberingType()
- : (SvxExtNumType)pGetField->GetFormat();
+ : (SvxNumType)pGetField->GetFormat();
const short nPageNum = std::max<short>(0, pSetField->GetOffset() + nDiff);
pGetField->SetText( FormatNumber( nPageNum, nTmpFormat ) );
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 5c1c8e5..1beea37 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -865,7 +865,7 @@ void SwSetExpField::SetValue( const double& rAny )
SwValueField::SetValue(rAny);
if( IsSequenceField() )
- sExpand = FormatNumber( GetValue(), (SvxExtNumType)GetFormat() );
+ sExpand = FormatNumber( GetValue(), (SvxNumType)GetFormat() );
else
sExpand = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue( rAny,
GetFormat(), GetLanguage());
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 3c7b2e6..69233a9 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -431,7 +431,7 @@ SwField * SwField::CopyField() const
}
/// expand numbering
-OUString FormatNumber(sal_uInt32 nNum, SvxExtNumType nFormat)
+OUString FormatNumber(sal_uInt32 nNum, SvxNumType nFormat)
{
if(SVX_NUM_PAGEDESC == nFormat)
return OUString::number( nNum );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index d2dc259..3c513ec7 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1984,7 +1984,7 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe
(nVal <= SVX_NUM_ARABIC ||
SVX_NUM_CHARS_UPPER_LETTER_N == nVal ||
SVX_NUM_CHARS_LOWER_LETTER_N == nVal ))
- aFormat.SetNumberingType((SvxExtNumType)nVal);
+ aFormat.SetNumberingType((SvxNumType)nVal);
else
bRet = false;
}
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index a142405..1d5ecd2 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -159,13 +159,13 @@ SwExpandPortion *SwTextFormatter::NewFieldPortion( SwTextFormatInfo &rInf,
sal_uInt16 nVirtNum = pFrame->GetVirtPageNum();
sal_uInt16 nNumPages = pTmpRootFrame->GetPageNum();
- SvxExtNumType nNumFormat = (SvxExtNumType)-1;
+ SvxNumType nNumFormat = (SvxNumType)-1;
if(SVX_NUM_PAGEDESC == pField->GetFormat())
nNumFormat = pFrame->FindPageFrame()->GetPageDesc()->GetNumType().GetNumberingType();
static_cast<SwPageNumberField*>(pField)
->ChangeExpansion(nVirtNum, nNumPages);
pPageNr->ChangeExpansion(pDoc,
- bVirt, nNumFormat != (SvxExtNumType)-1 ? &nNumFormat : nullptr);
+ bVirt, nNumFormat != (SvxNumType)-1 ? &nNumFormat : nullptr);
}
{
OUString const aStr( (bName)
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index b2405b4..b7892a0 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -326,7 +326,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
if(nTmp >= 0 &&
(nTmp <= SVX_NUM_ARABIC ||
nTmp > SVX_NUM_BITMAP))
- aFootnoteInfo.aFormat.SetNumberingType((SvxExtNumType)nTmp);
+ aFootnoteInfo.aFormat.SetNumberingType((SvxNumType)nTmp);
else
throw lang::IllegalArgumentException();
}
@@ -617,7 +617,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
{
sal_Int16 nTmp = 0;
aValue >>= nTmp;
- aEndInfo.aFormat.SetNumberingType((SvxExtNumType)nTmp);
+ aEndInfo.aFormat.SetNumberingType((SvxNumType)nTmp);
}
break;
case WID_START_AT:
@@ -836,7 +836,7 @@ void SwXLineNumberingProperties::setPropertyValue(
SvxNumberType aNumType(aFontMetric.GetNumType());
sal_Int16 nTmp = 0;
aValue >>= nTmp;
- aNumType.SetNumberingType((SvxExtNumType)nTmp);
+ aNumType.SetNumberingType((SvxNumType)nTmp);
aFontMetric.SetNumType(aNumType);
}
break;
@@ -1848,7 +1848,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
sal_Int16 nSet = 0;
pProp->Value >>= nSet;
if(nSet >= 0)
- aFormat.SetNumberingType((SvxExtNumType)nSet);
+ aFormat.SetNumberingType((SvxNumType)nSet);
else
bWrongArg = true;
}
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 03574fb..bdd3961 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -190,13 +190,13 @@ static HTMLOptionEnum aHTMLFileNameFieldFormatTable[] =
{ nullptr, 0 }
};
-SvxExtNumType SwHTMLParser::GetNumType( const OUString& rStr, SvxExtNumType nDfltType )
+SvxNumType SwHTMLParser::GetNumType( const OUString& rStr, SvxNumType nDfltType )
{
const HTMLOptionEnum *pOptEnums = aHTMLPageNumFieldFormatTable;
while( pOptEnums->pName )
{
if( rStr.equalsIgnoreAsciiCaseAscii( pOptEnums->pName ) )
- return (SvxExtNumType)pOptEnums->nValue;
+ return (SvxNumType)pOptEnums->nValue;
pOptEnums++;
}
return nDfltType;
@@ -411,19 +411,19 @@ void SwHTMLParser::NewField()
short nOff = 0;
- if( (SvxExtNumType)nFormat!=SVX_NUM_CHAR_SPECIAL && !aValue.isEmpty() )
+ if( (SvxNumType)nFormat!=SVX_NUM_CHAR_SPECIAL && !aValue.isEmpty() )
nOff = (short)aValue.toInt32();
else if( (SwPageNumSubType)nSub == PG_NEXT )
nOff = 1;
else if( (SwPageNumSubType)nSub == PG_PREV )
nOff = -1;
- if( (SvxExtNumType)nFormat==SVX_NUM_CHAR_SPECIAL &&
+ if( (SvxNumType)nFormat==SVX_NUM_CHAR_SPECIAL &&
(SwPageNumSubType)nSub==PG_RANDOM )
nFormat = SVX_NUM_PAGEDESC;
pNewField = new SwPageNumberField(static_cast<SwPageNumberFieldType*>(pType), nSub, nFormat, nOff);
- if ((SvxExtNumType)nFormat == SVX_NUM_CHAR_SPECIAL)
+ if ((SvxNumType)nFormat == SVX_NUM_CHAR_SPECIAL)
static_cast<SwPageNumberField *>(pNewField)->SetUserString(aValue);
}
}
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 30c822f..0ee31b9 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -41,7 +41,7 @@ const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFormat )
{
const sal_Char *pFormatStr = nullptr;
- switch( (SvxExtNumType)nFormat )
+ switch( (SvxNumType)nFormat )
{
case SVX_NUM_CHARS_UPPER_LETTER: pFormatStr = OOO_STRING_SW_HTML_FF_uletter; break;
case SVX_NUM_CHARS_LOWER_LETTER: pFormatStr = OOO_STRING_SW_HTML_FF_lletter; break;
@@ -141,7 +141,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" );
pFormatStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFormat) );
- if( (SvxExtNumType)nFormat==SVX_NUM_CHAR_SPECIAL )
+ if( (SvxNumType)nFormat==SVX_NUM_CHAR_SPECIAL )
{
aValue = static_cast<const SwPageNumberField *>(pField)->GetUserString();
}
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 976aefa..9d2d625 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1718,7 +1718,7 @@ static void ParseCSS1_list_style_type( const CSS1Expression *pExpr,
if( SvxCSS1Parser::GetEnum( aNumberStyleTable, rValue, nEnum ) )
{
rPropInfo.m_bNumbering = true;
- rPropInfo.m_nNumberingType = (SvxExtNumType)nEnum;
+ rPropInfo.m_nNumberingType = (SvxNumType)nEnum;
}
if( SvxCSS1Parser::GetEnum( aBulletStyleTable, rValue, nEnum ) )
{
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 6d37d3e..41559fd 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -121,7 +121,7 @@ public:
sal_uInt16 m_nLeftBorderDistance;
sal_uInt16 m_nRightBorderDistance;
- SvxExtNumType m_nNumberingType;
+ SvxNumType m_nNumberingType;
sal_Unicode m_cBulletChar;
sal_uInt16 m_nColumnCount;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index c2a5ef3..cb16c4c 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -647,7 +647,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
// <SDFIELD>
public:
- static SvxExtNumType GetNumType( const OUString& rStr, SvxExtNumType eDfltType );
+ static SvxNumType GetNumType( const OUString& rStr, SvxNumType eDfltType );
private:
void NewField();
void EndField();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7fe7194..a564ae7 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5049,7 +5049,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
m_pSBase = new WW8ScannerBase(m_pStrm,m_pTableStream,m_pDataStream,m_pWwFib);
- static const SvxExtNumType eNumTA[16] =
+ static const SvxNumType eNumTA[16] =
{
SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N,
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 1116842..f7ee7d2 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -588,7 +588,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLevel )
{
- static const SvxExtNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
+ static const SvxNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N, SVX_NUM_ARABIC,
SVX_NUM_ARABIC, SVX_NUM_ARABIC };
@@ -597,7 +597,7 @@ static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLev
if (rAV.nfc < 8) {
rNum.SetNumberingType( eNumA[ rAV.nfc ] );
} else {
- SvxExtNumType nType = SVX_NUM_ARABIC;
+ SvxNumType nType = SVX_NUM_ARABIC;
switch( rAV.nfc ) {
case 14:
case 19:nType = SVX_NUM_FULL_WIDTH_ARABIC; break;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 8bee24d..9cd3387 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -510,7 +510,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, SfxItemSet*& rpItemSet,
{
sal_uInt8 aBits1(0);
sal_uInt16 nStartNo(0); // Start-Nr. fuer den Writer
- SvxExtNumType nType(SVX_NUM_ARABIC);
+ SvxNumType nType(SVX_NUM_ARABIC);
SvxAdjust eAdj; // Ausrichtung (Links/rechts/zent.)
sal_Unicode cBullet(0x2190); // default safe bullet
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 49043b2..4e0dfc6 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 (;;)
{
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index a472db9..5a59b80 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -771,7 +771,7 @@ void wwSectionManager::SetNumberingType(const wwSection &rNewSection,
SwPageDesc &rPageDesc)
{
// save page number format
- static const SvxExtNumType aNumTyp[5] =
+ static const SvxNumType aNumTyp[5] =
{
SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 3e28ed8..ae5ce73 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -116,7 +116,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
}
// format
- SvxExtNumType nSelFormat = rInf.GetNumType().GetNumberingType();
+ SvxNumType nSelFormat = rInf.GetNumType().GetNumberingType();
m_pFormatLB->SelectNumberingType(nSelFormat);
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 9aef2b9..75393ae 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -650,7 +650,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CollSelectGetFocus, Control&, void)
IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, ListBox&, rBox, void )
{
sal_uInt16 nMask = 1;
- SvxExtNumType nNumberType = static_cast<SwNumberingTypeListBox&>(rBox).GetSelectedNumberingType();
+ SvxNumType nNumberType = static_cast<SwNumberingTypeListBox&>(rBox).GetSelectedNumberingType();
for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
if(nActLevel & nMask)
diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx
index ae78b20..741447c 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 7d9362a..d66ac3e 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 ff8f60b..c8add14 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 7907b88..6f4c20a 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
More information about the Libreoffice-commits
mailing list