diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-01-05 10:41:53 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-18 09:13:56 +0100 |
| commit | 84405da245d7162e7484b2e48553b0eaab5c2a35 (patch) | |
| tree | 265d3bbd375065ab537fd87f504bb6d2e47eacd9 /sw | |
| parent | 0b04f0d9666c7193ebf3309c1d8f6a235fed2f2b (diff) | |
mailmerge: Create the layout when pressing Finish.
Change-Id: Ifde5fcf29329c58be1a71cfbcf08f95c4516ca0d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index b93a3afc486a..a8a652d6e2ec 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -230,11 +230,11 @@ void SwMailMergeLayoutPage::ActivatePage() } } -bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) +bool SwMailMergeLayoutPage::commitPage(::svt::WizardTypes::CommitPageReason eReason) { //now insert the frame and the greeting SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); - if(::svt::WizardTypes::eTravelForward == _eReason) + if (eReason == ::svt::WizardTypes::eTravelForward || eReason == ::svt::WizardTypes::eFinish) { long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FUNIT_TWIP))); long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FUNIT_TWIP))); |