sc/inc/strings.hrc | 7 +
sc/source/ui/dbgui/filtdlg.cxx | 7 +
sc/uiconfig/scalc/ui/standardfilterdialog.ui | 96 +++++++++++++--------------
3 files changed, 58 insertions(+), 52 deletions(-)
New commits:
commit 938fbac669bc59cf0b388bd0d21a2f14c4399757
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 17 09:29:08 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 17 14:40:51 2021 +0100
SCSTR_FILTER_TEXT_COLOR is used in two different contexts
in the autofilter popup and the standard filter combobox.
In the autofilter we want title case to match the other
entries there, for the standard filter we need the same
text as appears in the combobox list
Change-Id: I693d3fa8a9fa1bac0803971be593f107d5817e74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125371
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 59e1efd14b02..0cdbf7f1e540 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -35,8 +35,11 @@
#define SCSTR_TOP10FILTER NC_("SCSTR_TOP10FILTER",
"Top 10")
#define SCSTR_FILTER_EMPTY NC_("SCSTR_FILTER_EMPTY",
"Empty")
#define SCSTR_FILTER_NOTEMPTY
NC_("SCSTR_FILTER_NOTEMPTY", "Not Empty")
-#define SCSTR_FILTER_TEXT_COLOR
NC_("SCSTR_FILTER_TEXT_COLOR", "Text color")
-#define SCSTR_FILTER_BACKGROUND_COLOR
NC_("SCSTR_FILTER_BACKGROUND_COLOR", "Background color")
+#define SCSTR_FILTER_TEXT_COLOR
NC_("SCSTR_FILTER_TEXT_COLOR", "Text Color")
+#define SCSTR_FILTER_BACKGROUND_COLOR
NC_("SCSTR_FILTER_BACKGROUND_COLOR", "Background Color")
+// This must match the translation of the same strings of
standardfilterdialog|cond
+#define SCSTR_FILTER_TEXT_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Text color")
+#define SCSTR_FILTER_BACKGROUND_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Background color")
#define SCSTR_FILTER_NO_FILL
NC_("SCSTR_FILTER_NO_FILL", "No Fill")
#define SCSTR_FILTER_AUTOMATIC_COLOR
NC_("SCSTR_FILTER_AUTOMATIC_COLOR", "Automatic")
#define SCSTR_NONAME NC_("SCSTR_NONAME",
"unnamed")
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index e5eb4a7b333c..8b4c0b852a8b 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -60,8 +60,8 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow*
pCW, weld::Window* pPa
, aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
, aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY))
, aStrColumn(ScResId(SCSTR_COLUMN))
- , aStrTextColor(ScResId(SCSTR_FILTER_TEXT_COLOR))
- , aStrBackgroundColor(ScResId(SCSTR_FILTER_BACKGROUND_COLOR))
+ , aStrTextColor(ScResId(SCSTR_FILTER_TEXT_COLOR_COND))
+ , aStrBackgroundColor(ScResId(SCSTR_FILTER_BACKGROUND_COLOR_COND))
, nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY))
, theQueryData(static_cast<const
ScQueryItem&>(rArgSet.Get(nWhichQuery)).GetQueryData())
, pViewData(nullptr)
@@ -114,6 +114,9 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow*
pCW, weld::Window* pPa
m_xEdCopyArea->SetReferences(this, m_xFtDbAreaLabel.get());
m_xRbCopyArea->SetReferences(this, m_xEdCopyArea.get());
+ assert(m_xLbCond1->find_text(aStrTextColor) != -1);
+ assert(m_xLbCond1->find_text(aStrBackgroundColor) != -1);
+
Init( rArgSet );
// Hack: RefInput control
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index cb5e66ea62bb..359273e11ff7 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -420,18 +420,18 @@
<item><=</item>
<item>>=</item>
<item><></item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Largest</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Smallest</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Largest %</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Smallest %</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Contains</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Does not contain</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Begins with</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Does not begin with</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Ends with</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Does not end with</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Text color</item>
- <item translatable="yes"
context="standardfilterdialog|cond1">Background color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Largest</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Smallest</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Largest %</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Smallest %</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Contains</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not contain</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Begins with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not begin with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Ends with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not end with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Text color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Background color</item>
</items>
<accessibility>
<relation type="labelled-by"
target="label4"/>
@@ -459,18 +459,18 @@
<item><=</item>
<item>>=</item>
<item><></item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Largest</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Smallest</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Largest %</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Smallest %</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Contains</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Does not contain</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Begins with</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Does not begin with</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Ends with</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Does not end with</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Text color</item>
- <item translatable="yes"
context="standardfilterdialog|cond2">Background color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Largest</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Smallest</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Largest %</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Smallest %</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Contains</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not contain</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Begins with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not begin with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Ends with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not end with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Text color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Background color</item>
</items>
<accessibility>
<relation type="labelled-by"
target="label4"/>
@@ -498,18 +498,18 @@
<item><=</item>
<item>>=</item>
<item><></item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Largest</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Smallest</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Largest %</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Smallest %</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Contains</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Does not contain</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Begins with</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Does not begin with</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Ends with</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Does not end with</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Text color</item>
- <item translatable="yes"
context="standardfilterdialog|cond3">Background color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Largest</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Smallest</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Largest %</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Smallest %</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Contains</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not contain</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Begins with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not begin with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Ends with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not end with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Text color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Background color</item>
</items>
<accessibility>
<relation type="labelled-by"
target="label4"/>
@@ -537,18 +537,18 @@
<item><=</item>
<item>>=</item>
<item><></item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Largest</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Smallest</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Largest %</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Smallest %</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Contains</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Does not contain</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Begins with</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Does not begin with</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Ends with</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Does not end with</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Text color</item>
- <item translatable="yes"
context="standardfilterdialog|cond4">Background color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Largest</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Smallest</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Largest %</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Smallest %</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Contains</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not contain</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Begins with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not begin with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Ends with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Does not end with</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Text color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Background color</item>
</items>
<child internal-child="accessible">
<object class="AtkObject"
id="cond4-atkobject">
