summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2021-09-14 09:33:05 +0200
committerBalazs Varga <varga.balazs3@nisz.hu>2021-09-14 15:39:44 +0200
commit45c4caff685b15a0f1b87ef05436a7e6aca96851 (patch)
treeeab25f5bbb938dc830eb415757a68d5f949046b3
parent2bf269745bed9fefe32122fc432e239949bdf605 (diff)
tdf#144483 sw mail merge: save ranges in a single document
In the Save mail merged document dialog, it wasn't possible to save mail ranges in a single document, because of the bad UI of the dialog window: grouping range selector as a radio button with the single document/individual documents radio buttons. Moreover, commit f3993912ec4b526aa57cb4bfb4745d7298a4da82 "tdf#144427 sw mailmerge: fix merge all document" removed the hidden workaround: setting range at the third radio button, and selecting the first radio button. Using checkbox for the third option solved the problem as proposed. Change-Id: I43798fb036de07d1001bcb8d72c20de2d9c577b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122078 Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx2
-rw-r--r--sw/source/ui/inc/mmresultdialogs.hxx2
-rw-r--r--sw/uiconfig/swriter/ui/mmresultsavedialog.ui2
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 38bd28376d77..c18196571f6f 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -251,7 +251,7 @@ SwMMResultSaveDialog::SwMMResultSaveDialog(weld::Window* pParent)
, m_bCancelSaving(false)
, m_xSaveAsOneRB(m_xBuilder->weld_radio_button("singlerb"))
, m_xSaveIndividualRB(m_xBuilder->weld_radio_button("individualrb"))
- , m_xFromRB(m_xBuilder->weld_radio_button("fromrb"))
+ , m_xFromRB(m_xBuilder->weld_check_button("fromrb"))
, m_xFromNF(m_xBuilder->weld_spin_button("from"))
, m_xToFT(m_xBuilder->weld_label("toft"))
, m_xToNF(m_xBuilder->weld_spin_button("to"))
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index a2cd01f85a7a..445fb1ee546b 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -37,7 +37,7 @@ class SwMMResultSaveDialog final : public SfxDialogController
std::unique_ptr<weld::RadioButton> m_xSaveAsOneRB;
std::unique_ptr<weld::RadioButton> m_xSaveIndividualRB;
- std::unique_ptr<weld::RadioButton> m_xFromRB;
+ std::unique_ptr<weld::CheckButton> m_xFromRB;
std::unique_ptr<weld::SpinButton> m_xFromNF;
std::unique_ptr<weld::Label> m_xToFT;
std::unique_ptr<weld::SpinButton> m_xToNF;
diff --git a/sw/uiconfig/swriter/ui/mmresultsavedialog.ui b/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
index 19e678f5ac10..ffd9d6df3ce1 100644
--- a/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
+++ b/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
@@ -155,7 +155,7 @@
<property name="can_focus">False</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkRadioButton" id="fromrb">
+ <object class="GtkCheckButton" id="fromrb">
<property name="label" translatable="yes" context="mmresultsavedialog|fromrb">_From</property>
<property name="visible">True</property>
<property name="can_focus">True</property>