diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-06-10 15:15:56 +0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-06-20 19:17:46 +0000 |
| commit | be0f5f5b66c55081849250ffad9f600cd61a00a1 (patch) | |
| tree | 062df685586075fe5353ef9632d55197a97f2bb3 /svx | |
| parent | a8b6c7807ba79045dac3141eef2077e2d6cb69e3 (diff) | |
tdf#88290 Adapt the numbering popup to more than 8 items
The items count of NumberingTypeMgr is limited by 8, but
some languages have more items, so remove that limitation.
Also fix the behavior of the 10th item. The old sidebar
popup had a "None" item, whose id was 10 (defined by
DEFAULT_NONE from include/svx/nbdtmg.hxx), and that causes
now the 10th item to behave as on/off toggle. Since we
don't have a "None" item anymore, get rid of that behavior
completely.
Conflicts:
include/svx/nbdtmg.hxx
(cherry picked from commit 71b35212265bb93b10ca35ab964a36e6b6cc552b)
Change-Id: I5546ca637f9951cc093a7bbf8fda11dc35341d4e
Reviewed-on: https://gerrit.libreoffice.org/16337
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index f77522cadfab..12b025c129ed 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -1300,7 +1300,7 @@ void NumberingTypeMgr::Init() { aNumberings = xDefNum->getDefaultContinuousNumberingLevels( aLocale ); - sal_Int32 nLength = aNumberings.getLength() > DEFAULT_NUM_VALUSET_COUNT ? DEFAULT_NUM_VALUSET_COUNT :aNumberings.getLength(); + sal_Int32 nLength = aNumberings.getLength(); const Sequence<PropertyValue>* pValuesArr = aNumberings.getConstArray(); for(sal_Int32 i = 0; i < nLength; i++) |