rpms/libwpd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: rhbz#1489337 extend to earlier file format version

Browse Source
This commit is contained in:
Caolán McNamara 2017-09-07 14:08:23 +01:00
parent abed4b54bf
commit d97acfa0eb
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libwpd-tdf112269.patch
View File

@ -1,5 +1,5 @@
--- libwpd/src/lib/WP5StylesListener.cpp --- 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 @@ @@ -85,8 +85,9 @@
m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
m_currentPage.setPageSpan(1); m_currentPage.setPageSpan(1);
@ -12,3 +12,31 @@
{ {
if ((*HFiter).getOccurrence() != NEVER) 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<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
+ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
+ for (std::vector<WPXHeaderFooter>::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<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
+ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
+ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
+ HFiter != headerFooterList.end(); ++HFiter)
{
if ((*HFiter).getOccurrence() != NEVER)
{

5
libwpd.spec
View File

@ -3,7 +3,7 @@
Name: libwpd Name: libwpd
Summary: A library for import of WordPerfect documents Summary: A library for import of WordPerfect documents
Version: 0.10.1 Version: 0.10.1
Release: 7%{?dist} Release: 8%{?dist}
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
URL: http://libwpd.sf.net/ URL: http://libwpd.sf.net/
License: LGPLv2+ or MPLv2.0 License: LGPLv2+ or MPLv2.0
@ -93,6 +93,9 @@ install -m 0644 wpd2*.1 %{buildroot}/%{_mandir}/man1
%doc docs/%{name}.png %doc docs/%{name}.png
%changelog %changelog
* Thu Sep 07 2017 Caolán McNamara <caolanm@redhat.com> - 0.10.1-8
- Related: rhbz#1489337 extend to earlier file format version
* Thu Sep 07 2017 Caolán McNamara <caolanm@redhat.com> - 0.10.1-7 * Thu Sep 07 2017 Caolán McNamara <caolanm@redhat.com> - 0.10.1-7
- Resolves: rhbz#1489337 crashing wpd - Resolves: rhbz#1489337 crashing wpd