[Libreoffice-commits] core.git: include/svx svx/source

[Arvind K (via logerrit)]

 include/svx/strings.hrc                  |    3 +--
 svx/source/tbxctrls/bulletsnumbering.cxx |   11 +----------
 2 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 2ca71b5c6e0374254e7c75c75e54fa6a8caebfde
Author:     Arvind K <khandelwalarvin...@gmail.com>
AuthorDate: Fri Mar 3 01:05:54 2023 +0530
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Mar 30 08:10:34 2023 +0000

    tdf#146748 Change 'More Numbering/Bullets' options to 'Customize'
    
    Change-Id: Ia9ae20b8c73ddd762424c99eedbaf145fed81935
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148142
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index c54d99529ee3..b5b64bfd6304 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1107,8 +1107,7 @@
 #define RID_SVXSTR_DEFAULT                                  
NC_("RID_SVXSTR_DEFAULT", "Default")
 #define RID_SVXSTR_FRAME                                    
NC_("RID_SVXSTR_FRAME", "Borders")
 #define RID_SVXSTR_FRAME_STYLE                              
NC_("RID_SVXSTR_FRAME_STYLE", "Border Style")
-#define RID_SVXSTR_MORENUMBERING                            
NC_("RID_SVXSTR_MORENUMBERING", "More Numbering...")
-#define RID_SVXSTR_MOREBULLETS                              
NC_("RID_SVXSTR_MOREBULLETS", "More Bullets...")
+#define RID_SVXSTR_CUSTOMIZE                                
NC_("RID_SVXSTR_CUSTOMIZE", "Customize...")
 #define RID_SVXSTR_BY_AUTHOR                                
NC_("RID_SVXSTR_BY_AUTHOR", "By author")
 #define RID_SVXSTR_PAGES                                    
NC_("RID_SVXSTR_PAGES", "Pages")
 #define RID_SVXSTR_CLEARFORM                                
NC_("RID_SVXSTR_CLEARFORM", "Clear formatting")
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx 
b/svx/source/tbxctrls/bulletsnumbering.cxx
index a9195cd5a695..1a8636380921 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -107,22 +107,13 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl& 
rController,
     mxValueSet->SetOutputSizePixel(aSize);
     
mxValueSet->SetColor(Application::GetSettings().GetStyleSettings().GetFieldColor());
 
-    OUString aMoreItemText;
+    OUString aMoreItemText = SvxResId( RID_SVXSTR_CUSTOMIZE );
     if ( mePageType == NumberingPageType::BULLET )
-    {
-        aMoreItemText = SvxResId( RID_SVXSTR_MOREBULLETS );
         AddStatusListener( ".uno:CurrentBulletListType" );
-    }
     else if ( mePageType == NumberingPageType::SINGLENUM )
-    {
-        aMoreItemText = SvxResId( RID_SVXSTR_MORENUMBERING );
         AddStatusListener( ".uno:CurrentNumListType" );
-    }
     else
-    {
-        aMoreItemText = SvxResId( RID_SVXSTR_MORE );
         AddStatusListener( ".uno:CurrentOutlineType" );
-    }
 
     auto xImage = 
vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:OutlineBullet", 
mrController.getFrameInterface());
     mxMoreButton->set_image(xImage);