From c55644e25609a1d186dcc912d0cb3968b1ed0639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 12 May 2014 15:45:41 +0100 Subject: [PATCH] Resolves: rhbz#1096747 format->page crash on html doc --- 0001-fdo-77242-fix-crash.patch | 46 ++++++++++++++++++++++++++++++++++ libreoffice.spec | 6 ++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0001-fdo-77242-fix-crash.patch diff --git a/0001-fdo-77242-fix-crash.patch b/0001-fdo-77242-fix-crash.patch new file mode 100644 index 0000000..37c9040 --- /dev/null +++ b/0001-fdo-77242-fix-crash.patch @@ -0,0 +1,46 @@ +From d1d25c8cbc2962ce2501b4ed6034d2e4e4ccba9a Mon Sep 17 00:00:00 2001 +From: Andras Timar +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 +Reviewed-by: Miklos Vajna +--- + 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 (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 + diff --git a/libreoffice.spec b/libreoffice.spec index f2a01fa..057880d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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 - 1:4.2.4.2-11 +- Resolves: rhbz#1096747 format->page crash on html doc + * Mon May 12 2014 David Tardon - 1:4.2.4.2-10 - Resolves: fdo#78119 bad july (červenec) month name support in czech localization