current/SOURCES/0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch

From 4128c63d655869e0ab7befde2c46761d8e1b273f Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <thb@documentfoundation.org>
Date: Thu, 10 Apr 2014 19:40:54 +0200
Subject: [PATCH] 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>
---
 sfx2/source/dialog/templdlg.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index ecc4d41..cbd856f 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();
-- 
1.9.0

1	From 4128c63d655869e0ab7befde2c46761d8e1b273f Mon Sep 17 00:00:00 2001
2	From: Thorsten Behrens <thb@documentfoundation.org>
3	Date: Thu, 10 Apr 2014 19:40:54 +0200
4	Subject: [PATCH] Fix fdo#71423 - crash while editing Impress tables.
5
6	Band-aid fix for this nasty crasher, seems sometimes the
7	family item is not found.
8
9	Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06
10	(cherry picked from commit 058cfa72dcdd91df302be45f7fc59b0d961a420b)
11	Signed-off-by: Andras Timar <andras.timar@collabora.com>
12	---
13	sfx2/source/dialog/templdlg.cxx \| 4 +++-
14	1 file changed, 3 insertions(+), 1 deletion(-)
15
16	diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
17	index ecc4d41..cbd856f 100644
18	--- a/sfx2/source/dialog/templdlg.cxx
19	+++ b/sfx2/source/dialog/templdlg.cxx
20	@@ -1245,6 +1245,8 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
21	if(pStyleSheetPool && nActFamily != 0xffff)
22	{
23	const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
24	+ if(!pItem)
25	+ return;
26	pStyleSheetPool->SetSearchMask(pItem->GetFamily(), SFXSTYLEBIT_ALL_VISIBLE);
27	StyleTreeArr_Impl aArr;
28	SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
29	@@ -1589,7 +1591,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
30	// other filters for automatic
31	CheckItem( nActFamily, sal_True );
32	const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl();
33	- if ( 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags
34	+ if ( pStyleItem && 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags
35	&& nAppFilter != pItem->GetValue())
36	{
37	nAppFilter = pItem->GetValue();
38	--
39	1.9.0
40