sc/inc/strings.hrc | 2 --
sc/source/ui/inc/duplicaterecordsdlg.hxx | 1 -
sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx | 11 ++---------
sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui | 7 ++++---
4 files changed, 6 insertions(+), 15 deletions(-)
New commits:
commit 81a6c8704f19a08acb6c56cc39d5f117ee38df75
Author: Sahil Gautam <sahil.gautam.ext...@allotropia.de>
AuthorDate: Mon Nov 25 11:37:31 2024 +0530
Commit: Sahil Gautam <sahil.gautam.ext...@allotropia.de>
CommitDate: Mon Nov 25 13:15:57 2024 +0100
tdf#85976 Use correct labels in 'Handle Duplicate Records' dialog
+ 'Records:' to 'Compare by:'
+ if row is selected in 'Compare:', 'Header:' checkbox should be labeled as
'Data contains column headers' and vice versa for column
Change-Id: Ic9dfbab9a5636312c40b6945af3abdcd9b190310
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177230
Tested-by: Jenkins
Reviewed-by: Sahil Gautam <sahil.gautam.ext...@allotropia.de>
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 7ae3d47b5f43..faaa5e64998b 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -443,8 +443,6 @@
#define STR_DUPLICATERECORDSDLG_NODATAFOUND
NC_("STR_DUPLICATERECORDS_NODATAFOUND", "No data found to operate on.")
#define STR_DUPLICATERECORDS_DATACONATINSROWHEADERS
NC_("STR_DUPLICATERECORDS_DATACONATINSROWHEADERS", "Data contains row headers")
#define STR_DUPLICATERECORDS_DATACONATINSCOLUMNHEADERS
NC_("STR_DUPLICATERECORDS_DATACONATINSCOLUMNHEADERS", "Data contains column
headers")
-#define STR_DUPLICATERECORDS_RECORDSROWS
NC_("STR_DUPLICATERECORDS_RECORDSROWS", "Rows:")
-#define STR_DUPLICATERECORDS_RECORDSCOLUMNS
NC_("STR_DUPLICATERECORDS_RECORDSCOLUMNS", "Columns:")
#define STR_CONTENT_WITH_UNKNOWN_ENCRYPTION
NC_("STR_CONTENT_WITH_UNKNOWN_ENCRYPTION", "Document contains DRM content that
is encrypted with an unknown encryption method. Only the un-encrypted content
will be shown.")
diff --git a/sc/source/ui/inc/duplicaterecordsdlg.hxx
b/sc/source/ui/inc/duplicaterecordsdlg.hxx
index cee462cebdbb..5977bad41191 100644
--- a/sc/source/ui/inc/duplicaterecordsdlg.hxx
+++ b/sc/source/ui/inc/duplicaterecordsdlg.hxx
@@ -60,7 +60,6 @@ private:
std::unique_ptr<weld::RadioButton> m_xRadioRemove;
std::unique_ptr<weld::TreeView> m_xCheckList;
std::unique_ptr<weld::CheckButton> m_xAllChkBtn;
- std::unique_ptr<weld::Label> m_xRecordsLabel;
std::unique_ptr<weld::Button> m_xOkBtn;
diff --git a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
index b626236e0823..f3fe991b92a7 100644
--- a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
+++ b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
@@ -40,7 +40,6 @@ ScDuplicateRecordsDlg::ScDuplicateRecordsDlg(weld::Window*
pParent,
, m_xRadioRemove(m_xBuilder->weld_radio_button("remove"))
, m_xCheckList(m_xBuilder->weld_tree_view("checklist"))
, m_xAllChkBtn(m_xBuilder->weld_check_button("allcheckbtn"))
- , m_xRecordsLabel(m_xBuilder->weld_label("records"))
, m_xOkBtn(m_xBuilder->weld_button("okbtn"))
, mrCellData(rData)
, mrRange(rRange)
@@ -123,15 +122,9 @@ void ScDuplicateRecordsDlg::SetDialogData(bool bToggle)
void ScDuplicateRecordsDlg::SetDialogLabels()
{
if (m_xRadioRow->get_active())
- {
-
m_xIncludesHeaders->set_label(ScResId(STR_DUPLICATERECORDS_DATACONATINSROWHEADERS));
-
m_xRecordsLabel->set_label(ScResId(STR_DUPLICATERECORDS_RECORDSCOLUMNS));
- }
- else
- {
m_xIncludesHeaders->set_label(ScResId(STR_DUPLICATERECORDS_DATACONATINSCOLUMNHEADERS));
- m_xRecordsLabel->set_label(ScResId(STR_DUPLICATERECORDS_RECORDSROWS));
- }
+ else
+
m_xIncludesHeaders->set_label(ScResId(STR_DUPLICATERECORDS_DATACONATINSROWHEADERS));
}
void ScDuplicateRecordsDlg::InsertEntry(const OUString& rTxt, bool bToggle)
diff --git a/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
b/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
index 3e8f0c88865e..0822c3c3d03f 100644
--- a/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
+++ b/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
@@ -93,8 +93,9 @@
<object class="GtkLabel" id="compare">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="halign">start</property>
<property name="valign">start</property>
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|compare">Compare by:</property>
+ <property name="label" translatable="yes"
context="duplicaterecordsdialog|compare">Compare:</property>
<property name="mnemonic-widget">row</property>
</object>
<packing>
@@ -296,12 +297,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="records">
+ <object class="GtkLabel" id="compareby">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="label" translatable="no"
context="duplicaterecordsdialog|records">Records:</property>
+ <property name="label" translatable="no"
context="duplicaterecordsdialog|compareby">Compare by:</property>
<property name="mnemonic-widget">allcheckbtn</property>
</object>
<packing>
