summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/tabpages/page.cxx6
-rw-r--r--filter/source/svg/svgexport.cxx30
-rw-r--r--include/svx/pageitem.hxx12
-rw-r--r--reportdesign/source/core/sdr/RptModel.cxx4
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx2
-rw-r--r--sc/source/core/tool/editutil.cxx16
-rw-r--r--sc/source/filter/starcalc/scflt.cxx3
-rw-r--r--sd/source/core/drawdoc.cxx2
-rw-r--r--sd/source/core/drawdoc4.cxx10
-rw-r--r--sd/source/core/sdpage.cxx2
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx2
-rw-r--r--svx/source/items/pageitem.cxx7
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx10
-rw-r--r--sw/source/core/fields/dbfld.cxx2
-rw-r--r--sw/source/core/fields/expfld.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageStylesPanel.cxx4
-rw-r--r--sw/source/uibase/utlui/uitool.cxx2
18 files changed, 55 insertions, 63 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7b54e08336d1..d025d5b8119a 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 = SVX_ARABIC;
+ SvxNumType eNumType = css::style::NumberingType::ARABIC;
bLandscape = ( mpDefPrinter->GetOrientation() == Orientation::Landscape );
sal_uInt16 nUse = (sal_uInt16)SVX_PAGE_ALL;
pItem = GetItem( *rSet, SID_ATTR_PAGE );
@@ -805,10 +805,10 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
//Get the NumType value
nPos = m_pNumberFormatBox->GetSelectEntryPos();
- sal_uInt16 nEntryData = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pNumberFormatBox->GetEntryData(nPos));
+ SvxNumType nEntryData = static_cast<SvxNumType>(reinterpret_cast<sal_uLong>(m_pNumberFormatBox->GetEntryData(nPos)));
if ( m_pNumberFormatBox->IsValueChangedFromSaved() )
{
- aPage.SetNumType( (SvxNumType)nEntryData );
+ aPage.SetNumType( nEntryData );
bMod = true;
}
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 77964a862640..363bc068acd7 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -933,9 +933,9 @@ void SVGFilter::implGenerateMetaData()
}
// Add a (global) Page Numbering Type attribute for the document
- // NOTE: at present pSdrModel->GetPageNumType() returns always SVX_ARABIC
+ // NOTE: at present pSdrModel->GetPageNumType() returns always css::style::NumberingType::ARABIC
// so the following code fragment is pretty unuseful
- sal_Int32 nPageNumberingType = SVX_ARABIC;
+ sal_Int32 nPageNumberingType = css::style::NumberingType::ARABIC;
SvxDrawPage* pSvxDrawPage = SvxDrawPage::getImplementation( mSelectedPages[0] );
if( pSvxDrawPage )
{
@@ -946,24 +946,24 @@ void SVGFilter::implGenerateMetaData()
// That is used by CalcFieldHdl method.
mVisiblePagePropSet.nPageNumberingType = nPageNumberingType;
}
- if( nPageNumberingType != SVX_NUMBER_NONE )
+ if( nPageNumberingType != css::style::NumberingType::NUMBER_NONE )
{
OUString sNumberingType;
switch( nPageNumberingType )
{
- case SVX_CHARS_UPPER_LETTER:
+ case css::style::NumberingType::CHARS_UPPER_LETTER:
sNumberingType = "alpha-upper";
break;
- case SVX_CHARS_LOWER_LETTER:
+ case css::style::NumberingType::CHARS_LOWER_LETTER:
sNumberingType = "alpha-lower";
break;
- case SVX_ROMAN_UPPER:
+ case css::style::NumberingType::ROMAN_UPPER:
sNumberingType = "roman-upper";
break;
- case SVX_ROMAN_LOWER:
+ case css::style::NumberingType::ROMAN_LOWER:
sNumberingType = "roman-lower";
break;
- case SVX_ARABIC:
+ case css::style::NumberingType::ARABIC:
// arabic numbering type is the default, so we do not append any attribute for it
default:
// in case the numbering type is not handled we fall back on arabic numbering
@@ -1033,7 +1033,7 @@ void SVGFilter::implGenerateMetaData()
// Page Number Field
xPropSet->getPropertyValue( "IsPageNumberVisible" ) >>= bPageNumberVisibility;
- bPageNumberVisibility = bPageNumberVisibility && ( nPageNumberingType != SVX_NUMBER_NONE );
+ bPageNumberVisibility = bPageNumberVisibility && ( nPageNumberingType != css::style::NumberingType::NUMBER_NONE );
if( bPageNumberVisibility ) // visibility default value: 'hidden'
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrPageNumberVisibility, "visible" );
@@ -1379,7 +1379,7 @@ void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
mVisiblePagePropSet.bIsDateTimeFieldVisible = true;
mVisiblePagePropSet.bIsDateTimeFieldFixed = true;
mVisiblePagePropSet.nDateTimeFormat = SVXDATEFORMAT_B;
- mVisiblePagePropSet.nPageNumberingType = SVX_ARABIC;
+ mVisiblePagePropSet.nPageNumberingType = css::style::NumberingType::ARABIC;
// We collect info on master page elements visibility, and placeholder text shape content.
Reference< XPropertySet > xPropSet( rxPage, UNO_QUERY );
@@ -2274,20 +2274,20 @@ IMPL_LINK_TYPED( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
{
switch( mVisiblePagePropSet.nPageNumberingType )
{
- case SVX_CHARS_UPPER_LETTER:
+ case css::style::NumberingType::CHARS_UPPER_LETTER:
aRepresentation += "QWERTYUIOPASDFGHJKLZXCVBNM";
break;
- case SVX_CHARS_LOWER_LETTER:
+ case css::style::NumberingType::CHARS_LOWER_LETTER:
aRepresentation += "qwertyuiopasdfghjklzxcvbnm";
break;
- case SVX_ROMAN_UPPER:
+ case css::style::NumberingType::ROMAN_UPPER:
aRepresentation += "IVXLCDM";
break;
- case SVX_ROMAN_LOWER:
+ case css::style::NumberingType::ROMAN_LOWER:
aRepresentation += "ivxlcdm";
break;
// arabic numbering type is the default
- case SVX_ARABIC:
+ case css::style::NumberingType::ARABIC:
// in case the numbering type is not handled we fall back on arabic numbering
default:
aRepresentation += "0123456789";
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index e8580cb68aec..227cc398dbef 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -21,18 +21,8 @@
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
-#include <com/sun/star/style/NumberingType.hpp>
-enum SvxNumType
-{
- SVX_CHARS_UPPER_LETTER = css::style::NumberingType::CHARS_UPPER_LETTER,
- SVX_CHARS_LOWER_LETTER = css::style::NumberingType::CHARS_LOWER_LETTER,
- SVX_ROMAN_UPPER = css::style::NumberingType::ROMAN_UPPER,
- SVX_ROMAN_LOWER = css::style::NumberingType::ROMAN_LOWER,
- SVX_ARABIC = css::style::NumberingType::ARABIC,
- SVX_NUMBER_NONE = css::style::NumberingType::NUMBER_NONE,
- SVX_PAGEDESC = css::style::NumberingType::PAGE_DESCRIPTOR,
-};
+using SvxNumType = sal_Int16; // css::style::NumberingType constants
/*--------------------------------------------------------------------
usage of the page
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 0358ecf64a77..aca7a7699209 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 (SvxNumType)getStyleProperty<sal_Int16>(xReportDefinition,PROPERTY_NUMBERINGTYPE);
- return SVX_ARABIC;
+ return getStyleProperty<sal_Int16>(xReportDefinition,PROPERTY_NUMBERINGTYPE);
+ return css::style::NumberingType::ARABIC;
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index a62fdadc3271..a2b6ec538c0d 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2446,7 +2446,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((SvxNumType)getStyleProperty<sal_Int16>(m_xReportDefinition,PROPERTY_NUMBERINGTYPE));
+ aPageItem.SetNumType(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 01c428067b12..c2d1d72ebfc4 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -750,20 +750,20 @@ static OUString lcl_GetNumStr(sal_Int32 nNo, SvxNumType eType)
{
switch( eType )
{
- case SVX_CHARS_UPPER_LETTER:
- case SVX_CHARS_LOWER_LETTER:
+ case css::style::NumberingType::CHARS_UPPER_LETTER:
+ case css::style::NumberingType::CHARS_LOWER_LETTER:
aTmpStr = lcl_GetCharStr( nNo );
break;
- case SVX_ROMAN_UPPER:
- case SVX_ROMAN_LOWER:
+ case css::style::NumberingType::ROMAN_UPPER:
+ case css::style::NumberingType::ROMAN_LOWER:
if( nNo < 4000 )
- aTmpStr = SvxNumberFormat::CreateRomanString( nNo, ( eType == SVX_ROMAN_UPPER ) );
+ aTmpStr = SvxNumberFormat::CreateRomanString( nNo, ( eType == css::style::NumberingType::ROMAN_UPPER ) );
else
aTmpStr.clear();
break;
- case SVX_NUMBER_NONE:
+ case css::style::NumberingType::NUMBER_NONE:
aTmpStr.clear();
break;
@@ -776,7 +776,7 @@ static OUString lcl_GetNumStr(sal_Int32 nNo, SvxNumType eType)
break;
}
- if( SVX_CHARS_UPPER_LETTER == eType )
+ if( css::style::NumberingType::CHARS_UPPER_LETTER == eType )
aTmpStr = aTmpStr.toAsciiUpperCase();
}
return aTmpStr;
@@ -788,7 +788,7 @@ ScHeaderFieldData::ScHeaderFieldData()
aTime( tools::Time::EMPTY )
{
nPageNo = nTotalPages = 0;
- eNumType = SVX_ARABIC;
+ eNumType = css::style::NumberingType::ARABIC;
}
ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP )
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 9c98fc4e115c..77e54435ff9c 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -20,6 +20,7 @@
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
+#include <com/sun/star/style/NumberingType.hpp>
#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
@@ -859,7 +860,7 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
SvxPageItem aPageItem(ATTR_PAGE);
aPageItem.SetPageUsage( SVX_PAGE_ALL );
aPageItem.SetLandscape( pPage->Orientation != 1 );
- aPageItem.SetNumType( SVX_ARABIC );
+ aPageItem.SetNumType( css::style::NumberingType::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 809ed3e61daf..d3a4fea7c100 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -170,7 +170,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
, meLanguage( LANGUAGE_SYSTEM )
, meLanguageCJK( LANGUAGE_SYSTEM )
, meLanguageCTL( LANGUAGE_SYSTEM )
-, mePageNumType(SVX_ARABIC)
+, mePageNumType(css::style::NumberingType::ARABIC)
, mbAllocDocSh(false)
, meDocType(eType)
, mpCharClass(nullptr)
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 59a8167e2151..d92c0c7989fd 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1038,19 +1038,19 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
switch (mePageNumType)
{
- case SVX_CHARS_UPPER_LETTER:
+ case css::style::NumberingType::CHARS_UPPER_LETTER:
aPageNumValue += OUStringLiteral1( (nNum - 1) % 26 + 'A' );
break;
- case SVX_CHARS_LOWER_LETTER:
+ case css::style::NumberingType::CHARS_LOWER_LETTER:
aPageNumValue += OUStringLiteral1( (nNum - 1) % 26 + 'a' );
break;
- case SVX_ROMAN_UPPER:
+ case css::style::NumberingType::ROMAN_UPPER:
bUpper = true;
SAL_FALLTHROUGH;
- case SVX_ROMAN_LOWER:
+ case css::style::NumberingType::ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper);
break;
- case SVX_NUMBER_NONE:
+ case css::style::NumberingType::NUMBER_NONE:
aPageNumValue = " ";
break;
default:
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index f7e073fcadea..c541afe979ce 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2545,7 +2545,7 @@ const OUString& SdPage::GetName() const
aCreatedPageName = SD_RESSTR(STR_PAGE);
aCreatedPageName += " ";
- if( GetModel()->GetPageNumType() == SVX_NUMBER_NONE )
+ if( GetModel()->GetPageNumType() == css::style::NumberingType::NUMBER_NONE )
{
// if the document has number none as a formatting
// for page numbers we still default to arabic numbering
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 84fab5131493..29cd4fc83710 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -711,7 +711,7 @@ throw (UnknownPropertyException, PropertyVetoException,
case HANDLE_PAGENUMFMT:
{
sal_Int32 nValue = 0;
- if( (*pValues >>= nValue ) && (nValue >= SVX_CHARS_UPPER_LETTER ) && (nValue <= SVX_PAGEDESC) )
+ if( (*pValues >>= nValue ) && (nValue >= css::style::NumberingType::CHARS_UPPER_LETTER ) && (nValue <= css::style::NumberingType::PAGE_DESCRIPTOR) )
{
pDoc->SetPageNumType((SvxNumType)nValue);
bOk = true;
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index d30890f1d7c7..a26de42e755f 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -23,6 +23,7 @@
#include <svx/pageitem.hxx>
#include <editeng/itemtype.hxx>
#include <svx/unomid.hxx>
+#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/style/PageStyleLayout.hpp>
#include <com/sun/star/style/BreakType.hpp>
#include <svl/itemset.hxx>
@@ -36,7 +37,7 @@ SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(0);}
SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
- eNumType ( SVX_ARABIC ),
+ eNumType ( css::style::NumberingType::ARABIC ),
bLandscape ( false ),
eUse ( SVX_PAGE_ALL )
{
@@ -101,7 +102,7 @@ bool SvxPageItem::GetPresentation
{
rText = aDescName + cpDelimTmp;
}
- DBG_ASSERT( eNumType <= SVX_NUMBER_NONE, "enum overflow" );
+ DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" );
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp;
if ( bLandscape )
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE);
@@ -121,7 +122,7 @@ bool SvxPageItem::GetPresentation
{
rText += aDescName + cpDelimTmp;
}
- DBG_ASSERT( eNumType <= SVX_NUMBER_NONE, "enum overflow" );
+ DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" );
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp;
if ( bLandscape )
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE);
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 83611852aaff..95bcaedb2dfa 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1941,7 +1941,7 @@ void SdrModel::disposeOutliner( SdrOutliner* pOutliner )
SvxNumType SdrModel::GetPageNumType() const
{
- return SVX_ARABIC;
+ return css::style::NumberingType::ARABIC;
}
void SdrModel::ReadUserDataSequenceValue(const css::beans::PropertyValue* pValue)
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index ae23c3f189c1..0a25d0aa9ad9 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -355,19 +355,19 @@ IMPL_LINK_TYPED(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
switch(mpDoc->GetPageNumType())
{
- case SVX_CHARS_UPPER_LETTER:
+ case css::style::NumberingType::CHARS_UPPER_LETTER:
aPageNumValue += OUStringLiteral1( (mnPageNumber - 1) % 26 + 'A' );
break;
- case SVX_CHARS_LOWER_LETTER:
+ case css::style::NumberingType::CHARS_LOWER_LETTER:
aPageNumValue += OUStringLiteral1( (mnPageNumber - 1) % 26 + 'a' );
break;
- case SVX_ROMAN_UPPER:
+ case css::style::NumberingType::ROMAN_UPPER:
bUpper = true;
SAL_FALLTHROUGH;
- case SVX_ROMAN_LOWER:
+ case css::style::NumberingType::ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
break;
- case SVX_NUMBER_NONE:
+ case css::style::NumberingType::NUMBER_NONE:
aPageNumValue = " ";
break;
default:
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 85db205c400c..8628be1eaeb2 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -867,7 +867,7 @@ bool SwDBSetNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
{
sal_Int16 nSet = 0;
rAny >>= nSet;
- if(nSet < (sal_Int16) SVX_NUMBER_NONE )
+ if(nSet < css::style::NumberingType::NUMBER_NONE )
SetFormat(nSet);
else {
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 68e882af3a51..ce0af72573c4 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -986,7 +986,7 @@ bool SwSetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
case FIELD_PROP_USHORT2:
{
rAny >>= nTmp16;
- if(nTmp16 <= SVX_NUMBER_NONE )
+ if(nTmp16 <= css::style::NumberingType::NUMBER_NONE )
SetFormat(nTmp16);
else {
//exception(wrong_value)
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 85b6734b4876..3221eae389aa 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -454,8 +454,8 @@ IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void )
IMPL_LINK_NOARG_TYPED( PageStylesPanel, ModifyNumberingHdl, ListBox&, void )
{
- sal_uInt16 nEntryData = (sal_uInt16)reinterpret_cast<sal_uLong>(mpNumberSelectLB->GetEntryData(mpNumberSelectLB->GetSelectEntryPos()));
- mpPageItem->SetNumType((SvxNumType)nEntryData);
+ SvxNumType nEntryData = static_cast<SvxNumType>(reinterpret_cast<sal_uLong>(mpNumberSelectLB->GetEntryData(mpNumberSelectLB->GetSelectEntryPos())));
+ mpPageItem->SetNumType(nEntryData);
mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() });
}
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 514a91aba066..823e6d501986 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -420,7 +420,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
aPageItem.SetDescName(rPageDesc.GetName());
aPageItem.SetPageUsage(lcl_convertUseToSvx(rPageDesc.GetUseOn()));
aPageItem.SetLandscape(rPageDesc.GetLandscape());
- aPageItem.SetNumType((SvxNumType)rPageDesc.GetNumType().GetNumberingType());
+ aPageItem.SetNumType(rPageDesc.GetNumType().GetNumberingType());
rSet.Put(aPageItem);
// Size
generated by cgit (git 2.34.1) at 2024-08-06 07:57:22 +0000