diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-07 13:37:30 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-10 13:34:43 +0200 |
| commit | f4c63f8491d442af32063eca90e7b537a09bf1a9 (patch) | |
| tree | 575b7090c4ba4acca124f67a7c06bcf2c888cd66 | |
| parent | 28aa34a6087c9bf2033c14354d9d5346302d46df (diff) | |
Resolves: tdf#112269 libwpd fix
Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1
Reviewed-on: https://gerrit.libreoffice.org/42056
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 05da1c67e49a2d758799db735a826c4d292fea44)
| -rw-r--r-- | external/libwpd/UnpackedTarball_libwpd.mk | 1 | ||||
| -rw-r--r-- | external/libwpd/libwpd-tdf112269.patch.1 | 42 |
2 files changed, 43 insertions, 0 deletions
diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index 7fb7c3b2181d..495824d804b5 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpd,0)) $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ external/libwpd/libwpd-vs2013.patch.1 \ $(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \ + external/libwpd/libwpd-tdf112269.patch.1 \ )) ifneq ($(OS),MACOSX) diff --git a/external/libwpd/libwpd-tdf112269.patch.1 b/external/libwpd/libwpd-tdf112269.patch.1 new file mode 100644 index 000000000000..bc79ab0eaccd --- /dev/null +++ b/external/libwpd/libwpd-tdf112269.patch.1 @@ -0,0 +1,42 @@ +--- libwpd/src/lib/WP5StylesListener.cpp ++++ libwpd/src/lib/WP5StylesListener.cpp +@@ -85,8 +85,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/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) + { |