summaryrefslogtreecommitdiff
path: root/sw/source/ui/dbui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/dbui')
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx10
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx2
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 984ab547b1d9..bff5619a4270 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -68,8 +68,8 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(weld::Container* pPage,
, m_xPrevSetIB(m_xBuilder->weld_button("prev"))
, m_xNextSetIB(m_xBuilder->weld_button("next"))
, m_xDifferentlist(m_xBuilder->weld_button("differentlist"))
- , m_xSettings(new SwAddressPreview(m_xBuilder->weld_scrolled_window("settingspreviewwin")))
- , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("addresspreviewwin")))
+ , m_xSettings(new SwAddressPreview(m_xBuilder->weld_scrolled_window("settingspreviewwin", true)))
+ , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("addresspreviewwin", true)))
, m_xSettingsWIN(new weld::CustomWeld(*m_xBuilder, "settingspreview", *m_xSettings))
, m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "addresspreview", *m_xPreview))
{
@@ -315,7 +315,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, weld::Button&, rButto
SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(weld::Window* pParent, SwMailMergeConfigItem& rConfig)
: SfxDialogController(pParent, "modules/swriter/ui/selectblockdialog.ui", "SelectBlockDialog")
, m_rConfig(rConfig)
- , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
+ , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin", true)))
, m_xNewPB(m_xBuilder->weld_button("new"))
, m_xCustomizePB(m_xBuilder->weld_button("edit"))
, m_xDeletePB(m_xBuilder->weld_button("delete"))
@@ -471,7 +471,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
, m_xFieldFT(m_xBuilder->weld_label("customft"))
, m_xFieldCB(m_xBuilder->weld_combo_box("custom"))
, m_xOK(m_xBuilder->weld_button("ok"))
- , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
+ , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin", true)))
, m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "addrpreview", *m_xPreview))
, m_xDragED(new AddressMultiLineEdit(this))
, m_xDragWIN(new weld::CustomWeld(*m_xBuilder, "addressdest", *m_xDragED))
@@ -971,7 +971,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
, m_sNone(SwResId(SW_STR_NONE))
, m_rPreviewString(rPreview)
, m_rConfigItem(rConfigItem)
- , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
+ , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin", true)))
, m_xMatchingFI(m_xBuilder->weld_label("MATCHING_LABEL"))
, m_xAddressTitle(m_xBuilder->weld_label("addresselem"))
, m_xMatchTitle(m_xBuilder->weld_label("matchelem"))
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index c09f087b6d1c..d45f24093fd5 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -198,7 +198,7 @@ void SwGreetingsHandler::Contains(bool bContainsGreeting)
SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(weld::Container* pPage, SwMailMergeWizard* pWizard)
: vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage")
, SwGreetingsHandler(pWizard->GetConfigItem(), *m_xBuilder)
- , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
+ , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin", true)))
, m_xPreviewFI(m_xBuilder->weld_label("previewft"))
, m_xAssignPB(m_xBuilder->weld_button("assign"))
, m_xDocumentIndexFI(m_xBuilder->weld_label("documentindex"))