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

Resolves: rhbz#855972 crash on switching to outline view

Browse Source
This commit is contained in:
Caolán McNamara 2012-09-10 23:01:30 +01:00
parent bc8bf44417
commit 01b10a9a29
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Resolves-rhbz-855972-crash-on-switching-to-outline-v.patch Normal file
View File

@ -0,0 +1,29 @@
From d1c1cce4ec0222ac50f9f78ddf5f4ce7aa7377ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 10 Sep 2012 22:55:02 +0100
Subject: [PATCH] Resolves: rhbz#855972 crash on switching to outline view
Change-Id: Ic2675e9d1d8ce6bb67e9c9e4db292f79c4240409
---
svx/source/form/fmvwimp.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 195b47e..638fd6e 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -938,8 +938,10 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
do
{
+ SdrPageView *pPageView = m_pView ? m_pView->GetSdrPageView() : NULL;
+ SdrPage *pSdrPage = pPageView ? pPageView->GetPage() : NULL;
// get the forms collection of the page we belong to
- FmFormPage* pPage = m_pView ? PTR_CAST( FmFormPage, m_pView->GetSdrPageView()->GetPage() ) : NULL;
+ FmFormPage* pPage = PTR_CAST( FmFormPage, pSdrPage );
Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() );
const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0];
--
1.7.11.4

7
libreoffice.spec
View File

@ -34,7 +34,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 2%{?libo_prerelease}%{?dist}
Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@ -170,6 +170,7 @@ Patch9: 0001-disable-failing-check.patch
Patch10: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch
Patch11: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch
Patch13: 0001-Resolves-rhbz-842292-crash-in-calling-callback-whose.patch
Patch14: 0001-Resolves-rhbz-855972-crash-on-switching-to-outline-v.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -779,6 +780,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch10 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch
%patch11 -p1 -b .rhbz-846775-Clipboard-must-be-disposed-befo.patch
%patch13 -p1 -b .rhbz-842292-crash-in-calling-callback-whose.patch
%patch14 -p1 -b .rhbz-855972-crash-on-switching-to-outline-v.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@ -2009,6 +2011,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Mon Sep 10 2012 Caolán McNamara <caolanm@redhat.com> - 1:3.6.1.2-3
- Resolves: rhbz#855972 crash on switching to outline view
* Wed Aug 29 2012 Caolán McNamara <caolanm@redhat.com> - 1:3.6.1.2-2
- Related: rhbz#850709 hunspell en-US available standalone so
make English langpack require hunspell-en and core just