[Libreoffice-commits] core.git: sw/source

[Justin Luth]

 sw/source/ui/config/mailconfigpage.cxx  |    8 ++++++++
 sw/source/uibase/inc/mailconfigpage.hxx |    1 +
 2 files changed, 9 insertions(+)

New commits:
commit 8ee4911d572764c0e15ded8142d8c9be2ea3e875
Author: Justin Luth <justin_luth at sil.org>
Date:   Thu Jan 18 16:51:28 2018 +0300

    mailconfig UI: SSL CB toggles secure port 587 and unsecure 25
    
    If the default value is in the SMTP port field, switching
    SSL on and off will toggle between SECURE_PORT and DEFAULT_PORT
    
    Change-Id: Ie4bdd55a3d8bbe64ce6b8761ba30971464c1db4e
    Reviewed-on: https://gerrit.libreoffice.org/48211
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index c3928d35eccb..ec2ad5db503a 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -134,6 +134,7 @@ SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet
     m_pReplyToCB->SetClickHdl(LINK(this, SwMailConfigPage, ReplyToHdl));
     m_pServerAuthenticationPB->SetClickHdl(LINK(this, SwMailConfigPage, AuthenticationHdl));
     m_pTestPB->SetClickHdl(LINK(this, SwMailConfigPage, TestHdl));
+    m_pSecureCB->SetClickHdl(LINK(this, SwMailConfigPage, SecureHdl));
 }
 
 SwMailConfigPage::~SwMailConfigPage()
@@ -227,6 +228,13 @@ IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, Button*, void)
     ScopedVclPtrInstance<SwTestAccountSettingsDialog>(this)->Execute();
 }
 
+IMPL_LINK(SwMailConfigPage, SecureHdl, Button*, pBox, void)
+{
+    bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked();
+    m_pConfigItem->SetSecureConnection(bEnable);
+    m_pPortNF->SetValue(m_pConfigItem->GetMailPort());
+}
+
 SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent)
     : SfxModalDialog(pParent, "TestMailSettings", "modules/swriter/ui/testmailsettings.ui")
     , m_aCompletedImg(BitmapEx(RID_BMP_FORMULA_APPLY))
diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx
index 063712110d89..616c4f409987 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.hxx
@@ -53,6 +53,7 @@ class SwMailConfigPage : public SfxTabPage
     DECL_LINK(ReplyToHdl, Button*, void);
     DECL_LINK(AuthenticationHdl, Button*, void);
     DECL_LINK(TestHdl, Button*, void);
+    DECL_LINK(SecureHdl, Button*, void);
 
 public:
     SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet );