sw/source/ui/dbui/addresslistdialog.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit c61065b262051e510ab5229a8f10efc10962137f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jun 3 14:38:32 2015 +0200
SwAddressListDialog::LoadHdl_Impl: simplify
Change-Id: If716a706f109145c8a6b7fda4b59d2fd7b820f20
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx
b/sw/source/ui/dbui/addresslistdialog.cxx
index 16a55a7..cda553a 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -346,12 +346,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl)
{
- SwMailMergeWizard* pWizard = 0;
- if (GetParent() && GetParent()->GetParent())
- pWizard = dynamic_cast<SwMailMergeWizard*>(GetParent()->GetParent());
- SwView* pView = 0;
- if (pWizard)
- pView = pWizard->GetSwView();
+ SwView* pView = m_pAddressPage->GetWizard()->GetSwView();
const OUString sNewSource = SwDBManager::LoadAndRegisterDataSource(pView ?
pView->GetDocShell() : 0);
if(!sNewSource.isEmpty())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
