cui/source/tabpages/numpages.cxx | 6 +++--- editeng/source/items/numitem.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 37dd6e18f5cf498d230ffe8a0a395cfdf9625e0c Author: Vasily Melenchuk <vasily.melenc...@cib.de> AuthorDate: Fri Aug 13 16:56:06 2021 +0300 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Tue Aug 17 16:53:39 2021 +0200 tdf#143858: sw: default value for nInclUpperLevels is 1 SvxNumberFormat::nInclUpperLevels (matches text:display-levels in ODF) bit incorrect in its name: is counts total amount of levels to display, including current level. So value "0" seems have no sense: display 0 levels in total? In UI you can't select less than 1 level and ODF standard (19.797) using 1 as a default. This looks plausable. Change-Id: I596386c7b3cc4370910cd0ff6e927e501179fbdf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120458 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 8db9b0e26f43..ae5fc5872e23 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -690,7 +690,7 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) } else { - aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0)); + aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 1)); aFmt.SetCharFormatName(sNumCharFmtName); aFmt.SetBulletRelSize(100); // #i93908# @@ -1642,7 +1642,7 @@ IMPL_LINK(SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, weld::ComboBox&, rBox, if(SVX_NUM_BITMAP == (nNumberingType&(~LINK_TOKEN))) { bBmp |= nullptr != aNumFmt.GetBrush(); - aNumFmt.SetIncludeUpperLevels( 0 ); + aNumFmt.SetIncludeUpperLevels( 1 ); aNumFmt.SetListFormat("", "", i); if(!bBmp) aNumFmt.SetGraphic(""); @@ -1652,7 +1652,7 @@ IMPL_LINK(SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, weld::ComboBox&, rBox, } else if( SVX_NUM_CHAR_SPECIAL == nNumberingType ) { - aNumFmt.SetIncludeUpperLevels( 0 ); + aNumFmt.SetIncludeUpperLevels( 1 ); aNumFmt.SetListFormat("", "", i); if( !aNumFmt.GetBulletFont() ) aNumFmt.SetBulletFont(&aActBulletFont); diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 229ac4affd2c..933735db2ae9 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -164,7 +164,7 @@ void SvxNumberType::dumpAsXml( xmlTextWriterPtr pWriter ) const SvxNumberFormat::SvxNumberFormat( SvxNumType eType ) : SvxNumberType(eType), eNumAdjust(SvxAdjust::Left), - nInclUpperLevels(0), + nInclUpperLevels(1), nStart(1), cBullet(SVX_DEF_BULLET), nBulletRelSize(100),