Resolves: tdf#91403 no wrtshell during initial layout

(cherry picked from commit ff44502d) Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd

Resolves: tdf#91403 no wrtshell during initial layout
(cherry picked from commit ff44502d) Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd
cf851cda · Caolán McNamara · c0869339 · cf851cda
Kaydet (Commit) cf851cda authored May 27, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

fldref.cxx sw/source/ui/fldui/fldref.cxx +4 -1

No files found.
--- 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)