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

[Miklos Vajna]

 sw/source/ui/dbui/mmgreetingspage.hxx |    3 ++-
 sw/source/ui/dbui/mmresultdialogs.cxx |    3 ++-
 sw/source/uibase/app/apphdl.cxx       |    1 +
 sw/source/uibase/dbui/dbmgr.cxx       |    3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit e7fb8dc9a3c2f40823b2b0c12c7962dc408092cc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 24 21:09:22 2016 +0100

    cid#1357166 null pointer dereference
    
    Change-Id: Id1db85f7f52c2b35e069a0252457959b16a2fd02

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f69fcc2..703e3c6 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1265,7 +1265,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
                 // sub-document, to get the correct PageDesc.
                 if(!bFreezedLayouts && bCreateSingleFile)
                 {
-                    FreezeLayouts(pTargetShell, true);
+                    if (pTargetShell)
+                        FreezeLayouts(pTargetShell, true);
                     bFreezedLayouts = true;
                 }
             } while( !bCancel && bNoError &&
commit 80e3a7a671858f31133cf1fabfb5a3ca0b9a4680
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 24 21:05:35 2016 +0100

    cid#1357167 missing break
    
    Change-Id: I847106a409035b6432c799994008cd2dc7c05de0

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index e721abc..1add22a 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -793,6 +793,7 @@ void SwModule::ExecOther(SfxRequest& rReq)
             if (pConfigItem && pConfigItem->GetTargetView())
                 pConfigItem->GetTargetView()->GetViewFrame()->GetFrame().Appear();
         }
+        break;
         case FN_MAILMERGE_SAVE_DOCUMENTS:
         case FN_MAILMERGE_PRINT_DOCUMENTS:
         case FN_MAILMERGE_EMAIL_DOCUMENTS:
commit db7811852b7dcb662d24cad9fc4fe8a1d6519a80
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 24 21:04:14 2016 +0100

    cid#1357171 uninitialized members
    
    Change-Id: I8be96ed9ff66c9790b75e59fba17dd54eb12b7a2

diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 2510b75..f81090a 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -61,7 +61,8 @@ protected:
     SwMailMergeConfigItem& m_rConfigItem;
 
     SwGreetingsHandler(SwMailMergeConfigItem& rConfigItem)
-        : m_rConfigItem(rConfigItem)
+        : m_bIsTabPage(false),
+        m_rConfigItem(rConfigItem)
     {
     }
 
commit 9ef1c79e670fce2a3203d2a372e23b39fb290443
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 24 21:03:59 2016 +0100

    cid#1357170 uninitialized members
    
    Change-Id: Iccf20a4889c1b7598ef83f927844b9a0ddef7ee4

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index fd8f128..44b3679 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -219,7 +219,8 @@ public:
 };
 
 SwMMResultSaveDialog::SwMMResultSaveDialog(vcl::Window* pParent)
-    : SfxModalDialog(pParent, "MMResultSaveDialog", "modules/swriter/ui/mmresultsavedialog.ui")
+    : SfxModalDialog(pParent, "MMResultSaveDialog", "modules/swriter/ui/mmresultsavedialog.ui"),
+    m_bCancelSaving(false)
 {
     get(m_pSaveAsOneRB, "singlerb");
     get(m_pSaveIndividualRB, "individualrb");