coverity#1187860 Uninitialized pointer field

Change-Id: Ia68958ddb904cbb50969b3b184777ddd49ccb677

1 files changed, 8 insertions, 6 deletions

diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 7118d19e7033..6d23b1b24a80 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -415,20 +415,22 @@ SwXMailMerge::~SwXMailMerge()
 // Guarantee object consistence in case of an exception
 class MailMergeExecuteFinalizer {
 public:
-    MailMergeExecuteFinalizer(SwXMailMerge *mailmerge) {
-        OSL_ENSURE( mailmerge, "mailmerge object missing" );
-        this->m_aMailMerge = mailmerge;
+    MailMergeExecuteFinalizer(SwXMailMerge *mailmerge)
+        : m_pMailMerge(mailmerge)
+    {
+        assert(m_pMailMerge); //mailmerge object missing
     }
-    ~MailMergeExecuteFinalizer() {
+    ~MailMergeExecuteFinalizer()
+    {
         osl::MutexGuard pMgrGuard( GetMailMergeMutex() );
-        m_aMailMerge->m_pMgr = 0;
+        m_pMailMerge->m_pMgr = 0;
     }
 
 private:
     // Disallow copy
     MailMergeExecuteFinalizer(const MailMergeExecuteFinalizer&) {}
 
-    SwXMailMerge *m_aMailMerge;
+    SwXMailMerge *m_pMailMerge;
 };
 
 uno::Any SAL_CALL SwXMailMerge::execute(