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

[Markus Mohrhard]

 sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4fcb04ba5a127cd960ec65fc7788a51b13d3e036
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed Aug 3 20:10:05 2016 +0200

    add more nullptr checks, related tdf#100820
    
    See
    
http://crashreport.libreoffice.org/stats/crash_details/8569250c-b04a-43b0-b4b8-4b3a94daffe1
    
    Change-Id: I9070be3db57e77befe70c0a32ef6aa54c6c1cf85
    Reviewed-on: https://gerrit.libreoffice.org/27842
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    (cherry picked from commit 626a1aa960ed36f5c3370e2aab1e72d41df875cf)
    Reviewed-on: https://gerrit.libreoffice.org/27859
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx 
b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index 3a23913..3c4e2cc 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -205,7 +205,7 @@ uno::Reference<awt::XWindow> 
MMCurrentEntryController::createItemWindow(const un
 IMPL_LINK_TYPED(MMCurrentEntryController, CurrentEditUpdatedHdl, Edit&, rEdit, 
void)
 {
     SwView* pView = ::GetActiveView();
-    SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+    SwMailMergeConfigItem* pConfigItem = pView ? 
pView->GetMailMergeConfigItem() : nullptr;
 
     if (!pConfigItem)
         return;
@@ -226,7 +226,7 @@ void MMCurrentEntryController::statusChanged(const 
frame::FeatureStateEvent& rEv
         return;
 
     SwView* pView = ::GetActiveView();
-    SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+    SwMailMergeConfigItem* pConfigItem = pView ? 
pView->GetMailMergeConfigItem() : nullptr;
 
     if (!pConfigItem || !rEvent.IsEnabled)
     {
@@ -277,7 +277,7 @@ uno::Reference<awt::XWindow> 
MMExcludeEntryController::createItemWindow(const un
 IMPL_STATIC_LINK_TYPED(MMExcludeEntryController, ExcludeHdl, CheckBox&, 
rCheckbox, void)
 {
     SwView* pView = ::GetActiveView();
-    SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+    SwMailMergeConfigItem* pConfigItem = pView ? 
pView->GetMailMergeConfigItem() : nullptr;
 
     if (pConfigItem)
         pConfigItem->ExcludeRecord(pConfigItem->GetResultSetPosition(), 
rCheckbox.IsChecked());
@@ -289,7 +289,7 @@ void MMExcludeEntryController::statusChanged(const 
frame::FeatureStateEvent& rEv
         return;
 
     SwView* pView = ::GetActiveView();
-    SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+    SwMailMergeConfigItem* pConfigItem = pView ? 
pView->GetMailMergeConfigItem() : nullptr;
 
     if (!pConfigItem || !rEvent.IsEnabled)
     {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits