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

Resolves: rhbz#1096747 format->page crash on html doc

Browse Source
This commit is contained in:
Caolán McNamara 2014-05-12 15:45:41 +01:00
parent cf4f0b425a
commit c55644e256
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-fdo-77242-fix-crash.patch Normal file
View File

@ -0,0 +1,46 @@
From d1d25c8cbc2962ce2501b4ed6034d2e4e4ccba9a Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Thu, 24 Apr 2014 21:50:26 +0200
Subject: [PATCH] fdo#77242 fix crash
Change-Id: Ic28b2dccc02627446a794929fe970495b15eb0e1
Reviewed-on: https://gerrit.libreoffice.org/9154
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
sfx2/source/dialog/tabdlg.cxx | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 95bdbad..065a23c 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1270,7 +1270,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
*/
{
- sal_uInt16 const nId = pTabCtrl->GetCurPageId();
+ sal_uInt16 nId = pTabCtrl->GetCurPageId();
DBG_ASSERT( pImpl->aData.size(), "no Pages registered" );
SFX_APP();
@@ -1278,6 +1278,16 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
// Tab Page schon da?
SfxTabPage* pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
Data_Impl* pDataObject = Find( pImpl->aData, nId );
+
+ //UUUU fallback to 1st page when requested one does not exist
+ if(!pDataObject && pTabCtrl->GetPageCount())
+ {
+ pTabCtrl->SetCurPageId(pTabCtrl->GetPageId(0));
+ nId = pTabCtrl->GetCurPageId();
+ pTabPage = dynamic_cast< SfxTabPage* >(pTabCtrl->GetTabPage(nId));
+ pDataObject = Find(pImpl->aData, nId);
+ }
+
DBG_ASSERT( pDataObject, "Id not known" );
// Create TabPage if possible:
--
1.9.0

6
libreoffice.spec
View File

@ -37,7 +37,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 10%{?libo_prerelease}%{?dist}
Release: 11%{?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 and MPLv2.0
Group: Applications/Productivity
URL: http://www.libreoffice.org/
@ -308,6 +308,7 @@ Patch47: 0001-Related-rhbz-1071604-don-t-paint-anim.-effect-icon.patch
Patch48: 0001-Resolves-rhbz-1096486-avoid-access-to-nonexisting-pa.patch
Patch49: 0001-Resolves-rhbz-1096295-hard-to-distinguish-selected-f.patch
Patch50: 0001-fdo-78119-find-the-longest-match-for-month-name.patch
Patch51: 0001-fdo-77242-fix-crash.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2271,6 +2272,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Mon May 12 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.2.4.2-11
- Resolves: rhbz#1096747 format->page crash on html doc
* Mon May 12 2014 David Tardon <dtardon@redhat.com> - 1:4.2.4.2-10
- Resolves: fdo#78119 bad july (červenec) month name support in czech
localization