diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-27 17:24:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-27 17:25:42 +0100 |
| commit | cf851cda7c943548d0ce60d0b4836ccbf6e76698 (patch) | |
| tree | d6e7262aabcfc2a42d1b0ee162a1ee87d83c30aa /sw | |
| parent | c086933969e5edef80febe0e37a402798302ddb6 (diff) | |
Resolves: tdf#91403 no wrtshell during initial layout
(cherry picked from commit ff44502d836880d2bdb057e7fdfd9b5abeb87842)
Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/fldui/fldref.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index cef199107340..4a7ee1e05d63 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) |