include/svx/strings.hrc | 2 +- sc/source/ui/sidebar/CellBorderStyleControl.cxx | 1 - solenv/sanitizers/ui/modules/scalc.suppr | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 9b2d11fcdcdc5f75caf3e7645f795011afd4aef2 Author: Kira Tubo <[email protected]> AuthorDate: Thu Jun 20 16:01:24 2024 -0700 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Jun 21 14:02:25 2024 +0200 tdf#146468: Fix typo and move comments Fix typo on variable RID_SVXSTR_TABLE_PRESET_OUTER and move comments about consolidating border tooltip strings to solenv/sanitizers/ui/modules/scalc.suppr See comments on Gerrit for more information: https://gerrit.libreoffice.org/c/core/+/169052 Change-Id: Ic5283e568e13023242858850dbce8922e2c80d8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169308 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169329 diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index cf3c12e12a4e..8c61f7714e09 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -1811,7 +1811,7 @@ // strings related to borders #define RID_SVXSTR_TABLE_PRESET_NONE NC_("RID_SVXSTR_TABLE_PRESET_NONE", "No Borders") -#define RID_SVXSTR_TABLE_PRESET_OUTER NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border") // Sidebar/toolbar +#define RID_SVXSTR_TABLE_PRESET_OUTER NC_("RID_SVXSTR_TABLE_PRESET_OUTER", "Outer Border") // Sidebar/toolbar #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") // Format dialog #define RID_SVXSTR_TABLE_PRESET_OUTERHORI NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Outer Border and Horizontal Lines") #define RID_SVXSTR_TABLE_PRESET_OUTERALL NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Outer Border and All Inner Lines") diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 12ac05d23794..f8e792ee183b 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -64,7 +64,6 @@ CellBorderStylePopup::~CellBorderStylePopup() void CellBorderStylePopup::Initialize() { - // Tooltip values now controlled in svx/strings.hrc instead of sc/uiconfig/scalc/ui/floatingborderstyle.ui mxTBBorder1->connect_clicked ( LINK(this, CellBorderStylePopup, TB1SelectHdl) ); mxTBBorder1->set_item_tooltip_text(0, SvxResId(RID_SVXSTR_TABLE_PRESET_NONE)); mxTBBorder1->set_item_tooltip_text(1, SvxResId(RID_SVXSTR_TABLE_PRESET_OUTERALL)); diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr index 83df53230a57..e2e164de3b01 100644 --- a/solenv/sanitizers/ui/modules/scalc.suppr +++ b/solenv/sanitizers/ui/modules/scalc.suppr @@ -45,6 +45,8 @@ sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='invalid'] orph sc/uiconfig/scalc/ui/definename.ui://GtkLabel[@id='label'] orphan-label sc/uiconfig/scalc/ui/doubledialog.ui://GtkEntry[@id='value'] no-labelled-by sc/uiconfig/scalc/ui/externaldata.ui://GtkLabel[@id='secondsft'] orphan-label + +// Tooltip values now controlled in svx/strings.hrc instead of sc/uiconfig/scalc/ui/floatingborderstyle.ui sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='none'] button-no-label sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='all'] button-no-label sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='outside'] button-no-label @@ -61,6 +63,7 @@ sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagup'] button sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagdown'] button-no-label sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='topbottom'] button-no-label sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='leftright'] button-no-label + sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkLabel[@id='error-message'] orphan-label sc/uiconfig/scalc/ui/groupbynumber.ui://GtkEntry[@id='edit_by'] no-labelled-by sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_H_CUSTOM'] orphan-label
