external/libwpd/libwpd-tdf112269.patch.1

   1 --- libwpd/src/lib/WP5StylesListener.cpp
   2 +++ libwpd/src/lib/WP5StylesListener.cpp
   3 @@ -85,8 +85,9 @@
   4                 m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
   5                 m_currentPage.setPageSpan(1);
   6
   7 -               for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
   8 -                       HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
   9 +               std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
  10 +               for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
  11 +                       HFiter != headerFooterList.end(); ++HFiter)
  12                 {
  13                         if ((*HFiter).getOccurrence() != NEVER)
  14                         {
  15 --- libwpd/src/lib/WP42StylesListener.cpp
  16 +++ libwpd/src/lib/WP42StylesListener.cpp
  17 @@ -84,8 +84,9 @@
  18                         m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
  19                         m_currentPage.setPageSpan(1);
  20
  21 -                       for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
  22 -                               HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
  23 +                       std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
  24 +                       for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
  25 +                               HFiter != headerFooterList.end(); ++HFiter)
  26                         {
  27                                 if ((*HFiter).getOccurrence() != NEVER)
  28                                 {
  29 --- libwpd/src/lib/WP1StylesListener.cpp
  30 +++ libwpd/src/lib/WP1StylesListener.cpp
  31 @@ -83,8 +83,9 @@
  32                         m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
  33                         m_currentPage.setPageSpan(1);
  34
  35 -                       for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
  36 -                               HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
  37 +                       std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
  38 +                       for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
  39 +                               HFiter != headerFooterList.end(); ++HFiter)
  40                         {
  41                                 if ((*HFiter).getOccurrence() != NEVER)
  42                                 {