From 328d6aae9e2b7a73f6672800629230f5b46d15b1 Mon Sep 17 00:00:00 2001 From: Skyler Grey Date: Wed, 2 Aug 2023 08:31:56 +0000 Subject: Re-enable Bullets and Numbering → Customize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Revert change If0f7b953a40ca1d5f469087cb8f362a949c39b37 - Enable jsdialog for the customize page - Fix numbering not being selected when switching level - Fix start at field not having a default when changing level type to one that can use it - Disable types that rely on supporting graphics in LOK as we cannot provide them Change-Id: I2517289b553b8a3e9ed62c64b6514c6aab3702b6 Signed-off-by: Skyler Grey Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153806 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos (cherry picked from commit 6b9415005fee130e9d9b4b005a56975794a47934) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157957 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- cui/source/tabpages/numpages.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cui') diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 45ee580f1667..d1cb79341281 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -1089,7 +1090,9 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogC sal_uInt32 nCount = SvxNumberingTypeTable::Count(); for (sal_uInt32 i = 0; i < nCount; ++i) { - m_xFmtLB->append(OUString::number(SvxNumberingTypeTable::GetValue(i)), SvxNumberingTypeTable::GetString(i)); + int nValue = SvxNumberingTypeTable::GetValue(i); + if (comphelper::LibreOfficeKit::isActive() && (nValue & SVX_NUM_BITMAP)) continue; + m_xFmtLB->append(OUString::number(nValue), SvxNumberingTypeTable::GetString(i)); } // Get advanced numbering types from the component. @@ -1464,6 +1467,7 @@ void SvxNumOptionsTabPage::InitControls() else m_xBulColLB->SetNoSelection(); } + m_xStartED->set_value(1); // If this isn't set then changing the bullet type to a numbered type doesn't reset the start level switch(nBullet) { case SHOW_NUMBERING: -- cgit