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

[Caolán McNamara]

 sw/source/ui/fldui/fldref.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit cf851cda7c943548d0ce60d0b4836ccbf6e76698
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 27 17:24:13 2015 +0100

    Resolves: tdf#91403 no wrtshell during initial layout
    
    (cherry picked from commit ff44502d836880d2bdb057e7fdfd9b5abeb87842)
    
    Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd

diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index cef1991..4a7ee1e 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -198,9 +198,12 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
 
     // fill up with the sequence types
     SwWrtShell *pSh = GetWrtShell();
-    if(!pSh)
+    if (!pSh)
         pSh = ::GetActiveWrtShell();
 
+    if (!pSh)
+        return;
+
     const sal_uInt16 nFieldTypeCnt = pSh->GetFieldTypeCount(RES_SETEXPFLD);
 
     for (sal_uInt16 n = 0; n < nFieldTypeCnt; ++n)