rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#71423 crash while editing Impress tables

Browse Source
This commit is contained in:
Caolán McNamara 2014-04-22 13:31:24 +01:00
parent a38f5559bc
commit edebd1faf6
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch Normal file
View File

@ -0,0 +1,40 @@
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

2
libreoffice.spec
View File

@ -298,6 +298,7 @@ Patch31: 0001-Resolves-rhbz-1086714-overlarge-pixmap.patch
Patch32: 0001-every-even-numbered-print-job-is-reported-as-failed.patch
Patch33: 0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch
Patch34: 0001-table-not-resizing-when-rows-columns-added-to-it.patch
Patch35: 0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2291,6 +2292,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%changelog
* Tue Apr 22 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.2.4.1-3
- sometimes tables in impress don't resize when adding rows
- Resolves: fdo#71423 crash while editing Impress tables
* Fri Apr 18 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.2.4.1-2
- every 2nd print job is incorrectly flagged as failed