mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fdo#71423 - crash while editing Impress tables.

Browse Source 
Band-aid fix for this nasty crasher, seems sometimes the
family item is not found.

Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06
This commit is contained in:
Thorsten Behrens
2014-04-10 19:40:54 +02:00
parent 23648e824f
commit 058cfa72dc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sfx2/source/dialog/templdlg.cxx
View File

@@ -1191,6 +1191,8 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
if(pStyleSheetPool && nActFamily != 0xffff) if(pStyleSheetPool && nActFamily != 0xffff)
{ {
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
if(!pItem)
return;
pStyleSheetPool->SetSearchMask(pItem->GetFamily(), SFXSTYLEBIT_ALL_VISIBLE); pStyleSheetPool->SetSearchMask(pItem->GetFamily(), SFXSTYLEBIT_ALL_VISIBLE);
StyleTreeArr_Impl aArr; StyleTreeArr_Impl aArr;
SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
@@ -1533,7 +1535,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
// other filters for automatic // other filters for automatic
CheckItem( nActFamily, true ); CheckItem( nActFamily, true );
const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl(); const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl();
if ( 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags if ( pStyleItem && 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags
&& nAppFilter != pItem->GetValue()) && nAppFilter != pItem->GetValue())
{ {
nAppFilter = pItem->GetValue(); nAppFilter = pItem->GetValue();