sw/source/ui/dbui/mmoutputtypepage.cxx | 4 ++-- sw/source/ui/inc/mmresultdialogs.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 78b597191e9f10e4c523dae548bb51791efc36ff Author: Noel Grandin <[email protected]> Date: Tue Feb 6 10:46:55 2018 +0200 m_bDesctructionEnabled->m_bDestructionEnabled Change-Id: I94369455a965a1382d52e7f99cf1ec1f8af98d07 Reviewed-on: https://gerrit.libreoffice.org/49277 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index dcc1fc714981..fa01025d3fdd 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -256,7 +256,7 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& m_sCompleted( SwResId(ST_COMPLETED )), m_sFailed( SwResId(ST_FAILED )), m_bCancel(false), - m_bDesctructionEnabled(false), + m_bDestructionEnabled(false), m_pImpl(new SwSendMailDialog_Impl), m_pConfigItem(&rConfigItem), m_nSendCount(0), @@ -384,7 +384,7 @@ IMPL_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer, void ) m_pImpl->xMailDispatcher->shutdown(); } - if( m_bDesctructionEnabled && + if( m_bDestructionEnabled && (!m_pImpl->xMailDispatcher.is() || !m_pImpl->xMailDispatcher->isRunning())) { diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index 2b6f65aa58e2..d892c8a9244a 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -185,7 +185,7 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog OUString m_sFailed; bool m_bCancel; - bool m_bDesctructionEnabled; + bool m_bDestructionEnabled; SwSendMailDialog_Impl* m_pImpl; SwMailMergeConfigItem* m_pConfigItem; @@ -210,7 +210,7 @@ public: virtual void dispose() override; void AddDocument( SwMailDescriptor const & rDesc ); - void EnableDestruction() {m_bDesctructionEnabled = true;} + void EnableDestruction() {m_bDestructionEnabled = true;} void ShowDialog(); void DocumentSent( css::uno::Reference< css::mail::XMailMessage> const & xMessage, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
