sw/source/ui/dbui/mmdocselectpage.cxx | 1 +
sw/uiconfig/swriter/ui/mmselectpage.ui | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit d7e948938367048a4e408c30f2efb927e76a604e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Apr 2 20:12:54 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 6 12:51:23 2021 +0200
use Label::set_label_type to designate a label as a warning/error
To be consistent with other cases. weld::LabelType::Error is another
option. What colors, if any, it results in isn't cast in stone, but be
consistent in that all warnings (or errors) use the same ones.
Change-Id: I6943aa6370cf6cead60cd404987e8211532143eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113529
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx
b/sw/source/ui/dbui/mmdocselectpage.cxx
index 26e3a34d3a84..5ef0ee737f3a 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -52,6 +52,7 @@
SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(weld::Container* pPage, SwMai
, m_xDataSourceWarningFT(m_xBuilder->weld_label("datasourcewarning"))
, m_xExchangeDatabasePB(m_xBuilder->weld_button("exchangedatabase"))
{
+ m_xDataSourceWarningFT->set_label_type(weld::LabelType::Warning);
m_xCurrentDocRB->set_active(true);
DocSelectHdl(*m_xNewDocRB);
diff --git a/sw/uiconfig/swriter/ui/mmselectpage.ui
b/sw/uiconfig/swriter/ui/mmselectpage.ui
index 672b1ef9927b..126e3d0a284c 100644
--- a/sw/uiconfig/swriter/ui/mmselectpage.ui
+++ b/sw/uiconfig/swriter/ui/mmselectpage.ui
@@ -188,9 +188,6 @@
<property name="halign">start</property>
<property name="margin-start">18</property>
<property name="label" translatable="yes"
context="mmselectpage|extended_tip|datasourcewarning">Data source of the
current document is not registered. Please exchange database.</property>
- <attributes>
- <attribute name="foreground" value="#cccc00000000"/>
- </attributes>
</object>
<packing>
<property name="left_attach">0</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
