sw/source/ui/dbui/mailmergewizard.cxx | 13 -------------
1 file changed, 13 deletions(-)
New commits:
commit 02d5424751b456e5d29ef58a059b6ae604ac8616
Author: Gabor Kelemen <kelem...@ubuntu.com>
Date: Wed Mar 15 21:20:19 2017 +0100
There is no MM wizard page after Layout page now
Change-Id: Ifd15dada56581ccae704452f6c98f5b476ca15f5
Reviewed-on: https://gerrit.libreoffice.org/36094
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx
b/sw/source/ui/dbui/mailmergewizard.cxx
index c0fd5ba4b55d..927a09825e0c 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -126,19 +126,6 @@ VclPtr<TabPage> SwMailMergeWizard::createPage(WizardState
_nState)
void SwMailMergeWizard::enterState( WizardState _nState )
{
::svt::RoadmapWizard::enterState( _nState );
-/*
-
- entering a page after the layoutpage requires the insertion
- of greeting and address block - if not yet done
- entering the merge or output page requires to create the output document
-*/
- if(_nState > MM_LAYOUTPAGE && m_xConfigItem->GetSourceView() &&
- ((m_xConfigItem->IsAddressBlock() &&
!m_xConfigItem->IsAddressInserted()) ||
- (m_xConfigItem->IsGreetingLine(false) &&
!m_xConfigItem->IsGreetingInserted() )))
- {
-
SwMailMergeLayoutPage::InsertAddressAndGreeting(m_xConfigItem->GetSourceView(),
- *m_xConfigItem, Point(-1, -1), true);
- }
if (m_xConfigItem->GetTargetView())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
