sw/source/ui/fldui/fldref.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 475edbbe446df3250b3d898b8e2cc4c380c60ece
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed May 27 17:24:13 2015 +0100
Resolves: tdf#91403 no wrtshell during initial layout
(cherry picked from commit ff44502d836880d2bdb057e7fdfd9b5abeb87842)
(cherry picked from commit cf851cda7c943548d0ce60d0b4836ccbf6e76698)
Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd
Reviewed-on: https://gerrit.libreoffice.org/15933
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 360c080c..1244308 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -183,9 +183,12 @@ void SwFldRefPage::Reset(const SfxItemSet* )
// fill up with the sequence types
SwWrtShell *pSh = GetWrtShell();
- if(!pSh)
+ if (!pSh)
pSh = ::GetActiveWrtShell();
+ if (!pSh)
+ return;
+
const sal_uInt16 nFldTypeCnt = pSh->GetFldTypeCount(RES_SETEXPFLD);
for (sal_uInt16 n = 0; n < nFldTypeCnt; ++n)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
