sw/source/ui/fldui/fldref.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit ff44502d836880d2bdb057e7fdfd9b5abeb87842
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed May 27 17:24:13 2015 +0100
Resolves: tdf#91403 no wrtshell during initial layout
Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 994ae8f..16f2182 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 size_t nFieldTypeCnt = pSh->GetFieldTypeCount(RES_SETEXPFLD);
OSL_ENSURE( nFieldTypeCnt < static_cast<size_t>(REFFLDFLAG),
"<SwFieldRefPage::Reset> - Item index will overlap flags!" );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
