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

[Julien Nabet]

 sw/source/uibase/app/apphdl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a79b1192c3241a350115e5a653935bb6986a9099
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Mar 21 20:14:37 2016 +0100

    tdf#98787: Crash after showing mailmerge toolbar and showing preview
    
    Change-Id: I38034875a7175acd16e451e733c0d4c103c36eef
    Reviewed-on: https://gerrit.libreoffice.org/23411
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 9ff9992..e721abc 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -208,7 +208,7 @@ void SwModule::StateOther(SfxItemSet &rSet)
             case FN_MAILMERGE_LAST_ENTRY:
             {
                 SwView* pView = ::GetActiveView();
-                SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+                SwMailMergeConfigItem* pConfigItem = pView?pView->GetMailMergeConfigItem():nullptr;
                 if (!pConfigItem)
                     rSet.DisableItem(nWhich);
                 else