[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

[Gabor Kelemen]

 sw/source/ui/dbui/mmaddressblockpage.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 68d7d974867d226aaf691f6609651fdcd30b7d36
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Thu Jun 8 07:18:53 2017 +0200

    tdf#98800 Enable Next button on the third page of the MM Wizard
    
    This seems to enable and disable the Next button even if the
    'This page shall' checkbox is already enabled after a previous run.
    
    Change-Id: I9cba7649b9cd1df110c5a120d4eea3d97b3afcf1
    Reviewed-on: https://gerrit.libreoffice.org/38553
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 511c16bd8c8671f43d2ff93f845209e733c6ae4d)
    Reviewed-on: https://gerrit.libreoffice.org/39207

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 4e9cce014c5e..24b3ee80a23a 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -245,6 +245,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox, void
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
     rConfigItem.SetAddressBlock(m_pAddressCB->IsChecked());
     m_pWizard->UpdateRoadmap();
+    GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE));
 }
 
 IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, LinkParamNone*, void)