[Libreoffice-commits] core.git: sw/source sw/uiconfig

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/mmaddressblockpage.cxx     |   13 +++++++++++++
 sw/uiconfig/swriter/ui/mmaddressblockpage.ui |    8 +++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 5e01eb45862a59e1d68efabd725b69219fd3bee1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 23 13:15:36 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 23 21:14:17 2019 +0200

    give address page an initial size req of its max size
    
    so it won't jump around in size on activation
    
    Change-Id: If7c1ce0db0817ee552450a7776f98b7b9cc8a0a7
    Reviewed-on: https://gerrit.libreoffice.org/78009
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 51d00b0b53da..9f20fac6a0b6 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -97,6 +97,19 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(SwMailMergeWizard* pWiz
     Link<weld::Button&,void> aLink = LINK(this, SwMailMergeAddressBlockPage, InsertDataHdl_Impl);
     m_xPrevSetIB->connect_clicked(aLink);
     m_xNextSetIB->connect_clicked(aLink);
+
+    // lock in preferred size including current address line
+    Size aSize1(m_xContainer->get_preferred_size());
+
+    OUString sOrigLabel = m_xAddressListPB->get_label();
+    m_xAddressListPB->set_label(m_sChangeAddress);
+    Size aSize2(m_xContainer->get_preferred_size());
+    m_xAddressListPB->set_label(sOrigLabel);
+
+    m_xCurrentAddressFI->hide();
+
+    m_xContainer->set_size_request(std::max(aSize1.Width(), aSize2.Width()),
+                                   std::max(aSize1.Height(), aSize2.Height()));
 }
 
 SwMailMergeAddressBlockPage::~SwMailMergeAddressBlockPage()
diff --git a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
index a79532185440..b5008b95b9b2 100644
--- a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
+++ b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
@@ -90,8 +90,8 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="currentaddress">
+                        <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="no_show_all">True</property>
                         <property name="label" translatable="yes" context="mmaddressblockpage|currentaddress">Current address list: %1</property>
                         <property name="xalign">1</property>
                       </object>
@@ -114,7 +114,8 @@
                             <property name="hexpand">True</property>
                             <property name="label" translatable="yes" context="mmaddressblockpage|label2">Select the address list containing the address data you want to use. This data is needed to create the address block.</property>
                             <property name="wrap">True</property>
-                            <property name="max_width_chars">56</property>
+                            <property name="width_chars">40</property>
+                            <property name="max_width_chars">40</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
                           </object>
@@ -181,7 +182,8 @@
                             <property name="hexpand">True</property>
                             <property name="label" translatable="yes" context="mmaddressblockpage|label4">Match the field name used in the mail merge to the column headers in your data source.</property>
                             <property name="wrap">True</property>
-                            <property name="max_width_chars">56</property>
+                            <property name="width_chars">40</property>
+                            <property name="max_width_chars">40</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
                           </object>