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

[Julien Nabet]

 sw/source/core/doc/doclay.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d14a2c264506e8d5272e87e99f140b1f976b6ef
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Apr 21 13:54:07 2014 +0200

    Related: fdo#77720 Writer crashes when running Mail Merge Wizard
    
    Change-Id: I02695420ff4f54ad15b077ab1d16f27ff684e5da
    Reviewed-on: https://gerrit.libreoffice.org/9111
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 4afd2ee..7b601c8 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -721,7 +721,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType,
 
         const SfxPoolItem * pItem = NULL;
 
-        if (bCalledFromShell && !lcl_IsItemSet(*pNewTxtNd, RES_PARATR_ADJUST) &&
+        if (bCalledFromShell && pAnchorNode && !lcl_IsItemSet(*pNewTxtNd, RES_PARATR_ADJUST) &&
             SFX_ITEM_SET == pAnchorNode->GetSwAttrSet().
             GetItemState(RES_PARATR_ADJUST, true, &pItem))
         {