diff --git a/0001-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.patch b/0001-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.patch new file mode 100644 index 0000000..682fbc4 --- /dev/null +++ b/0001-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.patch @@ -0,0 +1,33 @@ +From a636847bdeda428aa2b669b6cd90f6c7f8232f9c Mon Sep 17 00:00:00 2001 +From: Michael Stahl +Date: Fri, 4 Jan 2013 22:27:22 +0100 +Subject: [PATCH] rhbz#890080: crash in SwXTextDocument::getRendererCount + +No idea how to reproduce it; pSwView is checked before use except here. +(possibly regression from 2f9f480b22f2fff59d9c48b4b46706c3d5223e66) + +Change-Id: Ia7667e879a6944e084a45c06133efc1ac2d8b3c0 +(cherry picked from commit 1c52268a5bc6d79c6ee1344e4e341c7e3820d4e0) +--- + sw/source/ui/uno/unotxdoc.cxx | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx +index 8711d4e..8fb89db 100644 +--- a/sw/source/ui/uno/unotxdoc.cxx ++++ b/sw/source/ui/uno/unotxdoc.cxx +@@ -2554,7 +2554,10 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( + SwViewOption aOpt( *pViewShell->GetViewOptions() ); + aOpt.setBrowseMode( false ); + pViewShell->ApplyViewOptions( aOpt ); +- pSwView->RecheckBrowseMode(); ++ if (pSwView) ++ { ++ pSwView->RecheckBrowseMode(); ++ } + } + + // reformating the document for printing will show the changes in the view +-- +1.7.11.7 + diff --git a/libreoffice.spec b/libreoffice.spec index 150d3ea..76d20de 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -174,6 +174,7 @@ Patch56: 0001-Do-not-move-nCurUndoAction-0.patch Patch57: 0001-fdo-48442-fix-default-hori-vert-frame-anchor-during-.patch Patch58: 0002-Resolves-fdo-53909-STG_FREE-sector-locations-rejecte.patch Patch59: 0003-Resolves-fdo-57532-restrict-page-sanity-check-to-non.patch +Patch60: 0001-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -1063,6 +1064,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch57 -p1 -b .fdo-48442-fix-default-hori-vert-frame-anchor-during-.patch %patch58 -p1 -b .Resolves-fdo-53909-STG_FREE-sector-locations-rejecte.patch %patch59 -p1 -b .Resolves-fdo-57532-restrict-page-sanity-check-to-non.patch +%patch60 -p1 -b .rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2352,6 +2354,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : * Fri Dec 21 2012 David Tardon - 1:3.5.7.2-8-UNBUILT - Resolves: rhbz#810739 Incorrect displaying attached rtf document - Resolves: rhbz#876606 regressions in MSO binary import filters +- Resolves: rhbz#890080 crash in SwXTextDocument::getRendererCount * Thu Dec 06 2012 Stephan Bergmann - 1:3.5.7.2-7 - Resolves: rendering documents in browser plug-in