From d97acfa0eb6e1318dd5dd405e3020b47e84f533b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 7 Sep 2017 14:08:23 +0100 Subject: [PATCH] Related: rhbz#1489337 extend to earlier file format version --- libwpd-tdf112269.patch | 30 +++++++++++++++++++++++++++++- libwpd.spec | 5 ++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/libwpd-tdf112269.patch b/libwpd-tdf112269.patch index 8ba0bfc..bc79ab0 100644 --- a/libwpd-tdf112269.patch +++ b/libwpd-tdf112269.patch @@ -1,5 +1,5 @@ --- libwpd/src/lib/WP5StylesListener.cpp -+++ libwpd/src/lib/WP5StylesListener.cpp 2017-09-07 13:35:20.728165572 +0100 ++++ libwpd/src/lib/WP5StylesListener.cpp @@ -85,8 +85,9 @@ m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); m_currentPage.setPageSpan(1); @@ -12,3 +12,31 @@ { if ((*HFiter).getOccurrence() != NEVER) { +--- libwpd/src/lib/WP42StylesListener.cpp ++++ libwpd/src/lib/WP42StylesListener.cpp +@@ -84,8 +84,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { +--- libwpd/src/lib/WP1StylesListener.cpp ++++ libwpd/src/lib/WP1StylesListener.cpp +@@ -83,8 +83,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { diff --git a/libwpd.spec b/libwpd.spec index 6092ab2..8a31acf 100644 --- a/libwpd.spec +++ b/libwpd.spec @@ -3,7 +3,7 @@ Name: libwpd Summary: A library for import of WordPerfect documents Version: 0.10.1 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz URL: http://libwpd.sf.net/ License: LGPLv2+ or MPLv2.0 @@ -93,6 +93,9 @@ install -m 0644 wpd2*.1 %{buildroot}/%{_mandir}/man1 %doc docs/%{name}.png %changelog +* Thu Sep 07 2017 Caolán McNamara - 0.10.1-8 +- Related: rhbz#1489337 extend to earlier file format version + * Thu Sep 07 2017 Caolán McNamara - 0.10.1-7 - Resolves: rhbz#1489337 crashing wpd