diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-22 17:30:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-23 14:48:03 +0200 |
| commit | 1d524bc7a331e8381e88cfd1b6dea4678ad32514 (patch) | |
| tree | cf001d2cbef5fe9be54548dcf67b864881b27898 /sw/source/ui/dbui/mmgreetingspage.cxx | |
| parent | 5264c7dcef25492e94d2d2e9a3025a7ec7571699 (diff) | |
rename AddressPreview back to SwAddressPreview
Change-Id: I2afd5580fd94621163a5217d08d5b60190673fd2
Reviewed-on: https://gerrit.libreoffice.org/77973
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/mmgreetingspage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 92ae1631111f..fe4b57ca5be5 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -173,7 +173,7 @@ void SwMailMergeGreetingsPage::UpdatePreview() OUString sPreview = bFemale ? m_xFemaleLB->get_active_text() : bNoValue ? m_xNeutralCB->get_active_text() : m_xMaleLB->get_active_text(); - sPreview = AddressPreview::FillData(sPreview, m_rConfigItem); + sPreview = SwAddressPreview::FillData(sPreview, m_rConfigItem); m_xPreview->SetAddress(sPreview); } @@ -199,7 +199,7 @@ void SwGreetingsHandler::Contains(bool bContainsGreeting) SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent) : vcl::OWizardPage(pParent, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage") , SwGreetingsHandler(pWizard->GetConfigItem(), *m_xBuilder) - , m_xPreview(new AddressPreview(m_xBuilder->weld_scrolled_window("previewwin"))) + , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin"))) , m_xPreviewFI(m_xBuilder->weld_label("previewft")) , m_xAssignPB(m_xBuilder->weld_button("assign")) , m_xDocumentIndexFI(m_xBuilder->weld_label("documentindex")) |