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

Resolves: rhbz#1077780 crash on loading a specific docx

Browse Source
This commit is contained in:
Caolán McNamara 2014-03-25 12:21:10 +00:00
parent 0b9af7fc6b
commit 4a39c20cfc
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-Resolves-rhbz-1077780-crash-on-loading-.docx.patch Normal file
View File

@ -0,0 +1,26 @@
From 88c2785c8fd4ec9ad9c4b318b91d1835cc04cd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 25 Mar 2014 12:12:37 +0000
Subject: [PATCH] Resolves: rhbz#1077780 crash on loading .docx
Change-Id: I92670b9c46a2c745ba47c6dcc1b4dd672942cf59
---
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 ++
1 file changed, 2 insertions(+)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index aa0896a..79c1847 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -636,6 +636,8 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame
{
try
{
+ if (!xStartTextRange.is()) //rhbz#1077780
+ return;
uno::Reference<text::XTextCursor> xRangeCursor = xStartTextRange->getText()->createTextCursorByRange( xStartTextRange );
xRangeCursor->gotoRange( xEndTextRange, true );
--
1.8.5.3

6
libreoffice.spec
View File

@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.1 Version: %{libo_version}.1
Release: 1%{?libo_prerelease}%{?dist} Release: 2%{?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 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 Group: Applications/Productivity
URL: http://www.libreoffice.org/default/ URL: http://www.libreoffice.org/default/
@ -283,6 +283,7 @@ Patch20: 0001-KDE-don-t-throw-on-TemplatePathVariable.patch
Patch21: 0001-Wizards-should-look-for-templates-in-Template_intern.patch Patch21: 0001-Wizards-should-look-for-templates-in-Template_intern.patch
Patch22: 0001-actively-search-for-wizards-dir-in-all-internal-temp.patch Patch22: 0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
Patch23: 0001-Related-rhbz-1076264-intermittent-a11y-crash-in-calc.patch Patch23: 0001-Related-rhbz-1076264-intermittent-a11y-crash-in-calc.patch
Patch24: 0001-Resolves-rhbz-1077780-crash-on-loading-.docx.patch
%define instdir %{_libdir} %define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice %define baseinstdir %{instdir}/libreoffice
@ -2172,6 +2173,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Tue Mar 25 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.2.3.1-2
- Resolves: rhbz#1077780 crash on loading a specific docx
* Mon Mar 17 2014 David Tardon <dtardon@redhat.com> - 1:4.2.3.1-1 * Mon Mar 17 2014 David Tardon <dtardon@redhat.com> - 1:4.2.3.1-1
- update to 4.2.3 rc1 - update to 4.2.3 rc1