summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <thb@documentfoundation.org>2014-04-10 19:40:54 +0200
committerDavid Tardon <dtardon@redhat.com>2014-04-24 10:10:58 +0000
commitc9c50b74fe1ca51e975deda780228386cefa8301 (patch)
tree4bac800b261660881066ba71979171fdd3da50b4
parent66a24cc40650fda5d24f51bce4fe688c8e943992 (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 (cherry picked from commit 058cfa72dcdd91df302be45f7fc59b0d961a420b) Signed-off-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 4128c63d655869e0ab7befde2c46761d8e1b273f) Reviewed-on: https://gerrit.libreoffice.org/9123 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
-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 ecc4d4192d1e..cbd856ff617a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1245,6 +1245,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();
@@ -1589,7 +1591,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
// other filters for automatic
CheckItem( nActFamily, sal_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();