diff --git a/0001-rhbz-1956977-crash-on-switch-from-active-comment-to-.patch b/0001-rhbz-1956977-crash-on-switch-from-active-comment-to-.patch new file mode 100644 index 0000000..a023665 --- /dev/null +++ b/0001-rhbz-1956977-crash-on-switch-from-active-comment-to-.patch @@ -0,0 +1,42 @@ +From fd87193917a26437ffd6ce08a33bb22e7b7353fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 4 May 2021 21:04:40 +0100 +Subject: [PATCH] rhbz#1956977 crash on switch from active comment to slide + sorter + +Change-Id: I2b5a5cb8b0631971b775a70d96f2cbf0c118c090 +--- + sd/source/ui/annotations/annotationmanager.cxx | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx +index 155862469313..898eb201d78e 100644 +--- a/sd/source/ui/annotations/annotationmanager.cxx ++++ b/sd/source/ui/annotations/annotationmanager.cxx +@@ -947,10 +947,13 @@ IMPL_LINK_NOARG(AnnotationManagerImpl, UpdateTagsHdl, void*, void) + + void AnnotationManagerImpl::CreateTags() + { +- + if( !(mxCurrentPage.is() && mpDoc) ) + return; + ++ auto xViewShell = mrBase.GetMainViewShell(); ++ if (!xViewShell) ++ return; ++ + try + { + int nIndex = 1; +@@ -963,7 +966,7 @@ void AnnotationManagerImpl::CreateTags() + { + Reference< XAnnotation > xAnnotation( xEnum->nextElement() ); + Color aColor( GetColorLight( mpDoc->GetAnnotationAuthorIndex( xAnnotation->getAuthor() ) ) ); +- rtl::Reference< AnnotationTag > xTag( new AnnotationTag( *this, *mrBase.GetMainViewShell()->GetView(), xAnnotation, aColor, nIndex++, maFont ) ); ++ rtl::Reference< AnnotationTag > xTag( new AnnotationTag( *this, *xViewShell->GetView(), xAnnotation, aColor, nIndex++, maFont ) ); + maTagVector.push_back(xTag); + + if( xAnnotation == mxSelectedAnnotation ) +-- +2.31.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 8c30ae6..d1fba4e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 3%{?libo_prerelease}%{?dist} +Release: 4%{?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 MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -252,6 +252,7 @@ Patch4: 0001-rhbz-1918152-fix-FTBFS.patch Patch5: 0001-Related-tdf-141197-critical-a11y-warning.patch Patch6: 0001-tdf-141197-if-we-have-a-sysobj-child-then-include-th.patch Patch7: 0001-Get-rid-of-apache-commons-logging.patch +Patch8: 0001-rhbz-1956977-crash-on-switch-from-active-comment-to-.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2237,6 +2238,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Wed May 05 2021 Caolán McNamara - 1:7.1.2.2-4 +- Resolves: rhbz#1956977 Impress crashes on switch from commenting to slide sorter + * Thu Apr 29 2021 Caolán McNamara - 1:7.1.2.2-3 - Resolves: rhbz#1955013 build libreoffice-langpack-fy for libreoffice