Merge pull request #89 from stkruse/bug_fix

Take top page margin, page header and table header into account for page breaks in long tables

Author: utelle

src/pdfxml.cpp

@@ -708,24 +708,26 @@ wxPdfTable::GetLastRowsOnPage() const
     const double yMax = pageHeight - breakMargin;
     const double firstBodyRowHeight = iterBodyFirst->second;
     const bool writeHeader = m_headRowLast > m_headRowFirst;
-    double headerHeight = 0;
-    //in case we have a line break and the table has a header, we need to consider the space of the header at the new page
-    if (writeHeader)
+
+    //m_document->GetHeaderHeight() is header height minus top margin, so we have to consider top margin as well
+    const double topTotalMargin = m_document->GetTopMargin() + m_document->GetHeaderHeight() + m_headHeight;
+
+    if (topTotalMargin + firstBodyRowHeight > yMax)
     {
-      for (unsigned int headRow = m_headRowFirst; headRow < m_headRowLast; headRow++)
-      {
-        headerHeight += m_rowHeights.find(headRow)->second;
-      }
+      wxLogError(wxString(wxS("wxPdfDocument::wxPdfTable: ")) +
+        wxString(_("Not possible to draw at least one table line on a page.")));
+      return lastRows;
     }
+
     double y = m_document->GetY();
 
     //this means basically that we have a line break before drawing the table
     y += m_headHeight + firstBodyRowHeight;
     if (y > yMax)
     {
       lastRows.Add(m_headRowLast);
-      //Maybe we have a header at the top of the next page
-      y = m_document->GetHeaderHeight();
+
+      y = topTotalMargin;
     }
 
     for (unsigned int row = m_bodyRowFirst + 1; row < m_bodyRowLast; ++row)
@@ -735,13 +737,8 @@ wxPdfTable::GetLastRowsOnPage() const
       {
         //since m_bodyRowLast and m_headRowLast are alway one behind last, last row on page is always one behind too.
         lastRows.Add(row);
-        //Maybe we have a header at the top of the next page
-        y = m_document->GetHeaderHeight();
-      }
-      if (writeHeader)
-      {
-        //consider the table header
-        y += headerHeight;
+
+        y = topTotalMargin;
       }
       y += rowHeight;
     }