summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <thb@documentfoundation.org>2014-04-10 19:40:54 +0200
committerThorsten Behrens <thb@documentfoundation.org>2014-04-10 19:43:23 +0200
commit058cfa72dcdd91df302be45f7fc59b0d961a420b (patch)
tree3fe2322fb0332f147769e908c9aea2f5d95d4819
parent23648e824fe41addb75a024374085bbc831b5d1b (diff)
Fix fdo#71423 - crash while editing Impress tables.
Band-aid fix for this nasty crasher, seems sometimes the family item is not found. Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06
-rw-r--r--sfx2/source/dialog/templdlg.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index d1a91fbe745a..a5597e881e8f 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1191,6 +1191,8 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
if(pStyleSheetPool && nActFamily != 0xffff)
{
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
+ if(!pItem)
+ return;
pStyleSheetPool->SetSearchMask(pItem->GetFamily(), SFXSTYLEBIT_ALL_VISIBLE);
StyleTreeArr_Impl aArr;
SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
@@ -1533,7 +1535,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
// other filters for automatic
CheckItem( nActFamily, true );
const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl();
- if ( 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags
+ if ( pStyleItem && 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags
&& nAppFilter != pItem->GetValue())
{
nAppFilter = pItem->GetValue();