summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/tabpages/numpages.cxx2
-rw-r--r--editeng/source/items/numitem.cxx4
-rw-r--r--filter/source/msfilter/svdfppt.cxx10
-rw-r--r--include/editeng/numitem.hxx12
-rw-r--r--svx/source/sidebar/nbdtmg.cxx4
-rw-r--r--sw/source/core/doc/number.cxx2
6 files changed, 17 insertions, 17 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 4a39f89ea353..531a4a76a483 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3450,7 +3450,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl)
SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(),
pActNum->GetLevelCount(),
pActNum->IsContinuousNumbering(),
- SVX_RULETYPE_NUMBERING,
+ SvxNumRuleType::NUMBERING,
pActNum->GetLevel( 0 ).GetPositionAndSpaceMode() );
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 6d4fd8aa7d98..0e4e0f8d3ecf 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -682,7 +682,7 @@ SvStream& SvxNumRule::Store( SvStream &rStream )
//first save of nFeatureFlags for old versions
rStream.WriteUInt16( static_cast<sal_uInt16>(nFeatureFlags) );
rStream.WriteUInt16( sal_uInt16(bContinuousNumbering) );
- rStream.WriteUInt16( eNumberingType );
+ rStream.WriteUInt16( static_cast<sal_uInt16>(eNumberingType) );
FontToSubsFontConverter pConverter = 0;
bool bConvertBulletFont = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_50 ) && ( rStream.GetVersion() );
@@ -782,7 +782,7 @@ const SvxNumberFormat& SvxNumRule::GetLevel(sal_uInt16 nLevel)const
DBG_ASSERT(nLevel < SVX_MAX_NUM, "Wrong Level" );
return ( ( nLevel < SVX_MAX_NUM ) && aFmts[nLevel] ) ?
- *aFmts[nLevel] : eNumberingType == SVX_RULETYPE_NUMBERING ?
+ *aFmts[nLevel] : eNumberingType == SvxNumRuleType::NUMBERING ?
*pStdNumFmt : *pStdOutlineNumFmt;
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 2c5243773f6e..a016b8543400 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4271,24 +4271,24 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
case TSS_TYPE_PAGETITLE :
case TSS_TYPE_TITLE :
nLevels = 1;
- eNumRuleType = SVX_RULETYPE_NUMBERING;
+ eNumRuleType = SvxNumRuleType::NUMBERING;
break;
case TSS_TYPE_SUBTITLE :
nLevels = SVX_MAX_NUM;
- eNumRuleType = SVX_RULETYPE_NUMBERING;
+ eNumRuleType = SvxNumRuleType::NUMBERING;
break;
case TSS_TYPE_BODY :
case TSS_TYPE_HALFBODY :
case TSS_TYPE_QUARTERBODY :
nLevels = SVX_MAX_NUM;
- eNumRuleType = SVX_RULETYPE_PRESENTATION_NUMBERING;
+ eNumRuleType = SvxNumRuleType::PRESENTATION_NUMBERING;
break;
default :
case TSS_TYPE_NOTES :
case TSS_TYPE_UNUSED :
case TSS_TYPE_TEXT_IN_SHAPE :
nLevels = SVX_MAX_NUM;
- eNumRuleType = SVX_RULETYPE_NUMBERING;
+ eNumRuleType = SvxNumRuleType::NUMBERING;
break;
}
SvxNumRule aRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR |
@@ -4306,7 +4306,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
{
for ( ;nDepth < nLevels; nDepth++ )
aRule.SetLevel( nDepth, aNumberFormat );
- if ( eNumRuleType == SVX_RULETYPE_PRESENTATION_NUMBERING )
+ if ( eNumRuleType == SvxNumRuleType::PRESENTATION_NUMBERING )
aRule.SetLevel( 0, aNumberFormat );
}
}
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index c749650235fe..7a12b5b10f8f 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -230,12 +230,12 @@ namespace o3tl
template<> struct typed_flags<SvxNumRuleFlags> : is_typed_flags<SvxNumRuleFlags, 0x03df> {};
}
-enum SvxNumRuleType
+enum class SvxNumRuleType
{
- SVX_RULETYPE_NUMBERING,
- SVX_RULETYPE_OUTLINE_NUMBERING,
- SVX_RULETYPE_PRESENTATION_NUMBERING,
- SVX_RULETYPE_END
+ NUMBERING,
+ OUTLINE_NUMBERING,
+ PRESENTATION_NUMBERING,
+ END
};
class EDITENG_DLLPUBLIC SvxNumRule
@@ -254,7 +254,7 @@ public:
SvxNumRule( SvxNumRuleFlags nFeatures,
sal_uInt16 nLevels,
bool bCont,
- SvxNumRuleType eType = SVX_RULETYPE_NUMBERING,
+ SvxNumRuleType eType = SvxNumRuleType::NUMBERING,
SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 8fff01f67a09..543dda1702dd 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -209,7 +209,7 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename)
SvxNumRule aDefNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::BULLET_COLOR |
SvxNumRuleFlags::CHAR_TEXT_DISTANCE | SvxNumRuleFlags::SYMBOL_ALIGNMENT,
10, false,
- SVX_RULETYPE_NUMBERING,SvxNumberFormat::LABEL_ALIGNMENT);
+ SvxNumRuleType::NUMBERING, SvxNumberFormat::LABEL_ALIGNMENT);
sal_uInt16 mLevel = 0x1;
xOStm->WriteInt32( nItem );
ApplyNumRule(aDefNumRule,nItem,mLevel,false,true);
@@ -1514,7 +1514,7 @@ void OutlineTypeMgr::Init()
SvxNumRule aDefNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::BULLET_COLOR |
SvxNumRuleFlags::CHAR_TEXT_DISTANCE | SvxNumRuleFlags::SYMBOL_ALIGNMENT,
10, false,
- SVX_RULETYPE_NUMBERING,SvxNumberFormat::LABEL_ALIGNMENT);
+ SvxNumRuleType::NUMBERING, SvxNumberFormat::LABEL_ALIGNMENT);
for(sal_Int32 nItem = 0;
nItem < aOutlineAccess.getLength() && nItem < DEFAULT_NUM_VALUSET_COUNT;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 53a8d9dee472..eefe8972d5f9 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -860,7 +860,7 @@ SvxNumRule SwNumRule::MakeSvxNumRule() const
SvxNumRule aRule(SvxNumRuleFlags::CONTINUOUS | SvxNumRuleFlags::CHAR_TEXT_DISTANCE | SvxNumRuleFlags::CHAR_STYLE |
SvxNumRuleFlags::ENABLE_LINKED_BMP | SvxNumRuleFlags::ENABLE_EMBEDDED_BMP,
MAXLEVEL, mbContinusNum,
- meRuleType == NUM_RULE ? SVX_RULETYPE_NUMBERING : SVX_RULETYPE_OUTLINE_NUMBERING );
+ meRuleType == NUM_RULE ? SvxNumRuleType::NUMBERING : SvxNumRuleType::OUTLINE_NUMBERING );
for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
{
SwNumFmt aNumFmt = Get(n);
generated by cgit (git 2.34.1) at 2025-01-16 20:11:56 +0000