diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index cd3ba8cc88f4..ba4964e28dcf 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3378,7 +3378,7 @@ - List of default bullets + List of default bullets in bullet library ● @@ -3393,7 +3393,7 @@ - List of default bullet fonts. Matching font for `DefaultBullets`. + List of default bullet fonts in bullet library. Matching font for `DefaultBullets`. OpenSymbol @@ -3406,6 +3406,26 @@ OpenSymbol + + + List of default bullets in unordered list + + + • + ◦ + ▪ + + + + + List of default bullet fonts in unordered list. Matching font for `DefaultListBullets`. + + + OpenSymbol + OpenSymbol + OpenSymbol + + diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index ea695848b948..992930f8c1a7 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1707,13 +1707,21 @@ void SwWrtShell::NumOrBulletOn(bool bNum) if (! bNum) { uno::Sequence aBulletSymbols( - officecfg::Office::Common::BulletsNumbering::DefaultBullets::get()); + officecfg::Office::Common::BulletsNumbering::DefaultListBullets::get()); uno::Sequence aBulletSymbolsFonts( - officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get()); - sal_Int32 nBulletSymbolIndex = nLvl < aBulletSymbols.getLength() ? nLvl : 0; + officecfg::Office::Common::BulletsNumbering::DefaultListBulletsFonts::get()); + if (!aBulletSymbols.hasElements()) + { + // Add a single element even if user cleared the list in the config + aBulletSymbols.realloc(1); + aBulletSymbols.getArray()[0] = u"•"_ustr; + aBulletSymbolsFonts.realloc(1); + aBulletSymbolsFonts.getArray()[0] = "OpenSymbol"; + } + sal_Int32 nBulletSymbolIndex = nLvl % aBulletSymbols.getLength(); aFormat.SetBulletChar(aBulletSymbols[nBulletSymbolIndex].toChar()); vcl::Font aFont; - sal_Int32 nBulletSymbolsFontIndex = nLvl < aBulletSymbolsFonts.getLength() ? nLvl : 0; + sal_Int32 nBulletSymbolsFontIndex = nLvl % aBulletSymbolsFonts.getLength(); aFont.SetFamilyName(aBulletSymbolsFonts[nBulletSymbolsFontIndex]); aFormat.SetBulletFont(&aFont); aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);