summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/items/pageitem.cxx2
-rw-r--r--svx/source/sidebar/nbdtmg.cxx8
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 5f85d00da589..2796103f1138 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 04f9dc1e5f4c..b753deb2b891 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 8aeb6b0a7529..7bb15c830f90 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)