sc/inc/strings.hrc | 8 +++-----
sc/source/ui/dbgui/filtdlg.cxx | 2 +-
sc/source/ui/dbgui/pfiltdlg.cxx | 2 +-
sc/source/ui/dbgui/tpsort.cxx | 4 ++--
sc/source/ui/dbgui/tpsubt.cxx | 2 +-
5 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 0613c89308c3d37c7631a9af3605b31abcff6980
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Fri Feb 11 01:23:27 2022 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Fri Feb 11 02:21:44 2022 +0100
Better SCSTR_COLUMN, SCSTR_ROW names, tdf#140290 follow-up
The remaining SCSTR_ROW wasn't used anymore at all, remove.
Rename
SCSTR_COLUMN -> SCSTR_COLUMN_LETTER "Column %1"
SCSTR_COLUMN_NAME -> SCSTR_COLUMN "Column"
SCSTR_ROW_NAME -> SCSTR_ROW "Row"
Change-Id: I1f68c8d0cc4e970ca508c8ee854f4c59a6d2f7d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129806
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index dd55baba8563..2e5f646af476 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -48,11 +48,9 @@
#define SCSTR_NONAME NC_("SCSTR_NONAME",
"unnamed")
#define SCSTR_INSERT_RTL NC_("SCSTR_INSERT_RTL",
"Shift cells left")
// "%1 is replaced to column letter, such as 'Column A'"
-#define SCSTR_COLUMN NC_("SCSTR_COLUMN",
"Column %1")
-// "%1 is replaced to row number, such as 'Row 1'"
-#define SCSTR_ROW NC_("SCSTR_ROW", "Row %1")
-#define SCSTR_COLUMN_NAME NC_("SCSTR_COLUMN_NAME",
"Column")
-#define SCSTR_ROW_NAME NC_("SCSTR_ROW_NAME",
"Row")
+#define SCSTR_COLUMN_LETTER NC_("SCSTR_COLUMN_LETTER",
"Column %1")
+#define SCSTR_COLUMN NC_("SCSTR_COLUMN",
"Column")
+#define SCSTR_ROW NC_("SCSTR_ROW", "Row")
#define SCSTR_TABLE NC_("SCSTR_TABLE", "Sheet")
#define SCSTR_NAME NC_("SCSTR_NAME", "Name")
#define SCSTR_APDTABLE NC_("SCSTR_APDTABLE",
"Append Sheet")
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 11f9378b10f7..6c9ba66db23a 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -58,7 +58,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow*
pCW, weld::Window* pPa
, aStrNone(ScResId(SCSTR_NONE))
, aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
, aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY))
- , aStrColumn(ScResId(SCSTR_COLUMN))
+ , aStrColumn(ScResId(SCSTR_COLUMN_LETTER))
, aStrTextColor(ScResId(SCSTR_FILTER_TEXT_COLOR_COND))
, aStrBackgroundColor(ScResId(SCSTR_FILTER_BACKGROUND_COLOR_COND))
, nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY))
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 5631ca1b72dc..e87d676b595c 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -42,7 +42,7 @@ ScPivotFilterDlg::ScPivotFilterDlg(weld::Window* pParent,
const SfxItemSet& rArg
, aStrNone(ScResId(SCSTR_NONE))
, aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
, aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY))
- , aStrColumn(ScResId(SCSTR_COLUMN))
+ , aStrColumn(ScResId(SCSTR_COLUMN_LETTER))
, nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY))
, theQueryData(static_cast<const
ScQueryItem&>(rArgSet.Get(nWhichQuery)).GetQueryData())
, pViewData(nullptr)
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index a0924f622998..84032ea264ce 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -74,8 +74,8 @@ ScTabPageSortFields::ScTabPageSortFields(weld::Container*
pPage, weld::DialogCon
m_aIdle("ScTabPageSortFields Scroll To End Idle"),
aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
- aStrColumn ( ScResId( SCSTR_COLUMN_NAME ) ),
- aStrRow ( ScResId( SCSTR_ROW_NAME ) ),
+ aStrColumn ( ScResId( SCSTR_COLUMN ) ),
+ aStrRow ( ScResId( SCSTR_ROW ) ),
nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
pViewData ( nullptr ),
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index b9496fdef35e..b94a02639083 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -41,7 +41,7 @@
ScTpSubTotalGroup::ScTpSubTotalGroup(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet)
: SfxTabPage(pPage, pController, "modules/scalc/ui/subtotalgrppage.ui",
"SubTotalGrpPage", &rArgSet)
, aStrNone(ScResId(SCSTR_NONE))
- , aStrColumn(ScResId(SCSTR_COLUMN))
+ , aStrColumn(ScResId(SCSTR_COLUMN_LETTER))
, pViewData(nullptr)
, pDoc(nullptr)
, nWhichSubTotals(rArgSet.GetPool()->GetWhich(SID_SUBTOTALS))
