diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-23 13:15:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-23 21:14:17 +0200 |
| commit | 5e01eb45862a59e1d68efabd725b69219fd3bee1 (patch) | |
| tree | bd56ee6e516d1b892877e41c0f6d5d574d6e1839 /sw/source/ui/dbui | |
| parent | c4c2e14b1b2cbd234772ca6f2be2a85528b6bc13 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
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() |