sc/inc/strings.hrc | 1 -
sc/source/ui/view/viewfunc.cxx | 1 -
sc/uiconfig/scalc/ui/warnautocorrect.ui | 2 ++
3 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7600afa82505ba4f5b78800aa95855d01bb766fc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 25 16:08:51 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 26 10:54:03 2022 +0100
split two paragraph warning into primary and secondary messages
Change-Id: Ie3bd9205a549ac55a0e5c7b9a444928b0fd80174
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128935
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 81908559a230..9a461a40d4ff 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -83,7 +83,6 @@
#define SCSTR_COLUMN_USER NC_("SCSTR_COLUMN_USER",
"Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide")
#define SCSTR_FIELDSEP_TAB NC_("SCSTR_FIELDSEP_TAB",
"Tab")
#define SCSTR_FIELDSEP_SPACE
NC_("SCSTR_FIELDSEP_SPACE", "space")
-#define SCSTR_FORMULA_AUTOCORRECTION
NC_("SCSTR_FORMULA_AUTOCORRECTION", "%PRODUCTNAME Calc found an error in the
formula entered.\nDo you want to accept the correction proposed below?\n\n")
#define SCSTR_UNDO_GRAFFILTER
NC_("SCSTR_UNDO_GRAFFILTER", "Image Filter")
#define STR_CAPTION_DEFAULT_TEXT
NC_("STR_CAPTION_DEFAULT_TEXT", "Text")
// Select tables dialog title
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index ecaa0a2cdf8a..8d444122a7ed 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -348,7 +348,6 @@ namespace
: weld::MessageDialogController(pParent,
"modules/scalc/ui/warnautocorrect.ui", "WarnAutoCorrect", "grid")
, m_xError(m_xBuilder->weld_text_view("error"))
{
-
m_xDialog->set_primary_text(ScResId(SCSTR_FORMULA_AUTOCORRECTION).trim());
m_xDialog->set_default_response(RET_YES);
const int nMaxWidth = m_xError->get_approximate_digit_width() * 65;
diff --git a/sc/uiconfig/scalc/ui/warnautocorrect.ui
b/sc/uiconfig/scalc/ui/warnautocorrect.ui
index 632dbcc80360..02c1cf055473 100644
--- a/sc/uiconfig/scalc/ui/warnautocorrect.ui
+++ b/sc/uiconfig/scalc/ui/warnautocorrect.ui
@@ -11,6 +11,8 @@
<property name="skip-taskbar-hint">True</property>
<property name="message-type">question</property>
<property name="buttons">yes-no</property>
+ <property name="text" translatable="yes"
context="warnautocorrect|WarnAutoCorrect">%PRODUCTNAME Calc found an error in
the formula entered.</property>
+ <property name="secondary-text" translatable="yes"
context="warnautocorrect|WarnAutoCorrect">Do you want to accept the correction
proposed below?</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can-focus">False</property>
