cui/source/tabpages/numpages.cxx | 9 ++++++---
i18npool/source/localedata/data/en_US.xml | 12 ++++++++++--
sw/qa/extras/uiwriter/uiwriter.cxx | 2 +-
3 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit f09e8642c66065bbaa57dea38ca4d68b606335d4
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Mon Jan 2 16:31:45 2023 -0500
Commit: Justin Luth <jl...@mail.com>
CommitDate: Fri Apr 21 01:27:34 2023 +0200
tdf#56258 en_US: increase outline levels definitions to 6
This is a squashed commit that includes
commit 894efac210a3871214d95a52c322b0bee40f00ba
tdf#56258 i18npool en-US: partial revert 5th outline level
There are 10 levels in numbering,
so it only makes sense to allow
outline definitions for all 10 levels.
Note that DOC/X formats only allow 9 levels,
There are two code paths that read these definitions.
The SVX toolbar code to allow 10 levels (SVX_MAX_NUM)
was already completed in the previous patch.
This commit allows 10 levels for the
Bullets and Numbering menu dialog.
Since all choices MUST define the same number of levels,
I only added one more. I hope that there isn't some secret
kind of requirement that ALL LOCALE's must also use
the same number of definitions - it doesn't seem to.
[Although not a direct comparison, bg_BG defines 10
single number levels, compared to en_US's 8,
and some Chinese locales also do more than 8.]
Change-Id: Ibe00d54cfa4577db83eba368b92be11055b076ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144976
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150661
Tested-by: Justin Luth <jl...@mail.com>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 916e513d9cc0..c307f6ac155f 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -510,11 +510,14 @@ SvxNumPickTabPage::SvxNumPickTabPage(weld::Container*
pPage, weld::DialogControl
SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[ nItem ];
Reference<XIndexAccess> xLevel =
aOutlineAccess.getConstArray()[nItem];
- for(sal_Int32 nLevel = 0; nLevel < xLevel->getCount() && nLevel <
5; nLevel++)
+ for(sal_Int32 nLevel = 0; nLevel < SVX_MAX_NUM; nLevel++)
{
- Any aValueAny = xLevel->getByIndex(nLevel);
+ // use the last locale-defined level for all remaining levels.
+ sal_Int32 nLocaleLevel = std::min(nLevel, xLevel->getCount() -
1);
Sequence<PropertyValue> aLevelProps;
- aValueAny >>= aLevelProps;
+ if (nLocaleLevel >= 0)
+ xLevel->getByIndex(nLocaleLevel) >>= aLevelProps;
+
SvxNumSettings_Impl* pNew =
lcl_CreateNumSettingsPtr(aLevelProps);
rItemArr.push_back( std::unique_ptr<SvxNumSettings_Impl>(pNew)
);
}
diff --git a/i18npool/source/localedata/data/en_US.xml
b/i18npool/source/localedata/data/en_US.xml
index 14c74a7e2932..ffd0bf1fad59 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -574,6 +574,7 @@
<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
@@ -581,6 +582,7 @@
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
@@ -588,6 +590,7 @@
<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix="."
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
@@ -595,20 +598,23 @@
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="250"
SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=")"
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
- <OutlineStyle>
+ <OutlineStyle> <!-- A.I.a.i. -->
<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="."
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0"
SymbolTextDistance="50" FirstLineOffset="0"/>
@@ -616,6 +622,7 @@
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150"
SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="4" LeftMargin="200"
SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" "
BulletChar="0020" BulletFontName="" ParentNumbering="5" LeftMargin="250"
SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
@@ -623,6 +630,7 @@
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")"
BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" "
BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0"
LeftMargin="250" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
</LC_OutLineNumberingLevel>
</Locale>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 5cad83ed7b0f..0e45204f25db 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1801,7 +1801,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf81995)
CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aIndexAccess.getLength());
for(const auto& rIndexAccess : aIndexAccess)
{
- CPPUNIT_ASSERT_EQUAL(sal_Int32(5), rIndexAccess->getCount());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(6), rIndexAccess->getCount());
for(int j=0;j<rIndexAccess->getCount();j++)
{
uno::Sequence<beans::PropertyValue> aProps;
