include/svx/strings.hrc | 1 -
svx/source/tbxctrls/bulletsnumbering.cxx | 2 --
svx/uiconfig/ui/numberingwindow.ui | 3 ++-
3 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit fe4cd0cebdbf9412e26f8182e79f97bb844d94af
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Feb 22 14:09:12 2024 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Mon Feb 26 07:41:02 2024 +0100
Set button label directly in ui file
Change-Id: If9e22982f4f7c276d19167ff365e1b4e290e3de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163748
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index c43bf8203981..eb8e06f0c4c7 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1108,7 +1108,6 @@
#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_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 e1a55a112346..e7ccc6238800 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -107,7 +107,6 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl&
rController,
mxValueSet->SetOutputSizePixel(aSize);
mxValueSet->SetColor(Application::GetSettings().GetStyleSettings().GetFieldColor());
- OUString aMoreItemText = SvxResId( RID_SVXSTR_CUSTOMIZE );
if ( mePageType == NumberingPageType::BULLET )
AddStatusListener( ".uno:CurrentBulletListType" );
else if ( mePageType == NumberingPageType::SINGLENUM )
@@ -117,7 +116,6 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl&
rController,
auto xImage =
vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:OutlineBullet",
mrController.getFrameInterface());
mxMoreButton->set_image(xImage);
- mxMoreButton->set_label(aMoreItemText);
mxMoreButton->connect_clicked(LINK(this, NumberingPopup,
VSButtonClickSetHdl));
mxValueSet->SetSelectHdl(LINK(this, NumberingPopup, VSSelectValueSetHdl));
diff --git a/svx/uiconfig/ui/numberingwindow.ui
b/svx/uiconfig/ui/numberingwindow.ui
index e303830fc01e..db44aeee4d8c 100644
--- a/svx/uiconfig/ui/numberingwindow.ui
+++ b/svx/uiconfig/ui/numberingwindow.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkImage" id="image1">
@@ -51,6 +51,7 @@
</child>
<child>
<object class="GtkButton" id="more">
+ <property name="label" translatable="yes"
context="numberingwindow|more">Customize...</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
