diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/fields/dbfld.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/fields/expfld.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageStylesPanel.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/utlui/uitool.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
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 |