diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2017-03-15 21:20:19 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-05 07:32:36 +0000 |
| commit | 02d5424751b456e5d29ef58a059b6ae604ac8616 (patch) | |
| tree | 5916e440602d5d8127d4910b5968a3a52a4dbf03 /sw | |
| parent | 662a1b0a52bdb891ae5802a4799af884e854f205 (diff) | |
There is no MM wizard page after Layout page now
Change-Id: Ifd15dada56581ccae704452f6c98f5b476ca15f5
Reviewed-on: https://gerrit.libreoffice.org/36094
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mailmergewizard.cxx | 13 |
1 files changed, 0 insertions, 13 deletions
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()) { |