File libwpd-0.8.14-post.patch of Package mingw32-libwpd

Overview Repositories Revisions Requests Users Attributes Meta

File libwpd-0.8.14-post.patch of Package mingw32-libwpd (Revision e58f8a884a2084ccfeca1f7c82b0a263)

Currently displaying revision e58f8a884a2084ccfeca1f7c82b0a263 , Show latest

--- src/lib/WP1Parser.cpp	14 Nov 2006 14:52:45 -0000	1.7
+++ src/lib/WP1Parser.cpp	15 Apr 2008 19:42:37 -0000	1.7.6.1
@@ -160,6 +160,7 @@
 					break;
 				case 0xB8:
 					listener->attributeChange(false, WP1_ATTRIBUTE_SUBSCRIPT);
+					break;
 
 				default:
 					// unsupported or undocumented token, ignore
--- src/lib/WP3DisplayGroup.cpp	9 May 2007 12:37:26 -0000	1.6
+++ src/lib/WP3DisplayGroup.cpp	15 Apr 2008 19:42:37 -0000	1.6.4.1
@@ -67,6 +67,7 @@
 	{
 	case WP3_DISPLAY_GROUP_INSERT_PAGE_NUMBER:
 		listener->insertPageNumber(m_pageNumber);
+		break;
 	case WP3_DISPLAY_GROUP_INSERT_FOOTNOTE_NUMBER:
 	case WP3_DISPLAY_GROUP_INSERT_ENDNOTE_NUMBER:
 		listener->insertNoteReference(m_noteReference);
--- src/lib/WP3PageFormatGroup.cpp	9 May 2007 12:37:26 -0000	1.17
+++ src/lib/WP3PageFormatGroup.cpp	15 Apr 2008 19:42:37 -0000	1.17.2.1
@@ -250,9 +250,10 @@
 
 	case WP3_PAGE_FORMAT_GROUP_SUPPRESS_PAGE:
 		listener->suppressPage(m_suppressCode);
+		break;
 
 	case WP3_PAGE_FORMAT_GROUP_INDENT_AT_BEGINNING_OF_PARAGRAPH:
-			listener->indentFirstLineChange(fixedPointToWPUs(m_indent));
+		listener->indentFirstLineChange(fixedPointToWPUs(m_indent));
 		break;
 		
 
--- src/lib/WP6ContentListener.cpp	10 Jan 2008 20:29:35 -0000	1.36.4.8
+++ src/lib/WP6ContentListener.cpp	25 Mar 2008 10:52:49 -0000	1.36.4.9
@@ -1372,11 +1372,14 @@
 			       	m_ps->m_currentTableCellNumberInRow)->m_borderBits, cellFgColor, cellBgColor,      
 			       cellBorderColor, cellVerticalAlignment);
 
+		m_ps->m_cellAttributeBits = 0;
 		if (useCellAttributes)
 			m_ps->m_cellAttributeBits = cellAttributes;
-		else
+		else if (m_ps->m_currentTableCol > 0 && m_ps->m_tableDefinition.m_columnsProperties.size() >= (unsigned)m_ps->m_currentTableCol)
 			m_ps->m_cellAttributeBits = m_ps->m_tableDefinition.m_columnsProperties[m_ps->m_currentTableCol-1].m_attributes;
-		justificationChange(m_ps->m_tableDefinition.m_columnsProperties[m_ps->m_currentTableCol-1].m_alignment);
+
+		if (m_ps->m_currentTableCol > 0 && m_ps->m_tableDefinition.m_columnsProperties.size() >= (unsigned)m_ps->m_currentTableCol)
+			justificationChange(m_ps->m_tableDefinition.m_columnsProperties[m_ps->m_currentTableCol-1].m_alignment);
 	}
 }
 
--- src/lib/WP6VariableLengthGroup.cpp	9 May 2007 12:37:28 -0000	1.36
+++ src/lib/WP6VariableLengthGroup.cpp	31 Mar 2008 13:36:47 -0000	1.36.2.1
@@ -126,7 +126,8 @@
 	uint32_t startPosition = input->tell();
 	
 	m_subGroup = readU8(input);
-	m_size = readU16(input);
+	if ((m_size = readU16(input)) == 0)
+		throw FileException();
 	m_flags = readU8(input);
 
 	if (m_flags & WP6_VARIABLE_GROUP_PREFIX_ID_BIT)
--- src/lib/WPXContentListener.cpp	8 Dec 2007 12:15:05 -0000	1.15.4.7
+++ src/lib/WPXContentListener.cpp	18 Jul 2008 12:56:17 -0000	1.15.4.9
@@ -65,7 +65,7 @@
 	m_cellAttributeBits(0x00000000),
 	m_paragraphJustificationBeforeTable(WPX_PARAGRAPH_JUSTIFICATION_LEFT),
 	
-	m_nextPageSpanIter(),
+	m_currentPage(0),
 	m_numPagesRemainingInSpan(0),
 
 	m_sectionAttributesChanged(false),
@@ -125,7 +125,6 @@
 	m_listenerImpl(listenerImpl),
 	m_metaData()
 {
-	m_ps->m_nextPageSpanIter = pageList.begin();
 }
 
 WPXContentListener::~WPXContentListener()
@@ -244,20 +243,23 @@
 	m_ps->m_listReferencePosition += m_ps->m_pageMarginLeft;
 	m_ps->m_listBeginPosition += m_ps->m_pageMarginLeft;
 	
-	if ( m_pageList.empty() || (m_ps->m_nextPageSpanIter == m_pageList.end()))
+	if ( m_pageList.empty() || (m_ps->m_currentPage >= m_pageList.size()) )
 	{
-		WPD_DEBUG_MSG(("m_pageList.empty() || (m_ps->m_nextPageSpanIter == m_pageList.end())\n"));
+		WPD_DEBUG_MSG(("m_pageList.empty() || (m_ps->m_currentPage >= m_pageList.size())\n"));
 		throw ParseException();
 	}
 
-	WPXPageSpan currentPage = (*m_ps->m_nextPageSpanIter);
+	std::list<WPXPageSpan>::iterator currentPageSpanIter = m_pageList.begin();
+	for ( unsigned i = 0; i < m_ps->m_currentPage; i++ )
+		currentPageSpanIter++;
+
+	WPXPageSpan currentPage = (*currentPageSpanIter);
 	currentPage.makeConsistent(1);
 	
 	WPXPropertyList propList;
 	propList.insert("libwpd:num-pages", currentPage.getPageSpan());
 
-	std::list<WPXPageSpan>::iterator lastPageSpan = --m_pageList.end(); 
-	propList.insert("libwpd:is-last-page-span", ((m_ps->m_nextPageSpanIter == lastPageSpan) ? true : false));
+	propList.insert("libwpd:is-last-page-span", ((m_ps->m_currentPage + 1 == m_pageList.size()) ? true : false));
 	propList.insert("fo:page-height", currentPage.getFormLength());
 	propList.insert("fo:page-width", currentPage.getFormWidth());
 	if (currentPage.getFormOrientation() == LANDSCAPE)
@@ -353,7 +355,7 @@
 	m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange + m_ps->m_textIndentByTabs;
 
 	m_ps->m_numPagesRemainingInSpan = (currentPage.getPageSpan() - 1);
-	m_ps->m_nextPageSpanIter++;
+	m_ps->m_currentPage++;
 }
 
 void WPXContentListener::_closePageSpan()
@@ -478,11 +480,21 @@
 	propList.insert("fo:margin-top", m_ps->m_paragraphMarginTop);
 	propList.insert("fo:margin-bottom", m_ps->m_paragraphMarginBottom);
 	propList.insert("fo:line-height", m_ps->m_paragraphLineSpacing, PERCENT);
+	_insertBreakIfNecessary(propList);
+}
+
+void WPXContentListener::_insertBreakIfNecessary(WPXPropertyList &propList)
+{
 	if (m_ps->m_isParagraphPageBreak && !m_ps->m_inSubDocument) // no hard page-breaks in subdocuments
 		propList.insert("fo:break-before", "page");
 	else if (m_ps->m_isParagraphColumnBreak)
-		propList.insert("fo:break-before", "column");
-}
+	{
+		if (m_ps->m_numColumns > 1)
+			propList.insert("fo:break-before", "column");
+		else
+			propList.insert("fo:break-before", "page");
+	}
+}	
 
 void WPXContentListener::_getTabStops(WPXPropertyListVector &tabStops)
 {
@@ -728,10 +740,7 @@
 	}
 
 	// cater for the possibility to have the column/page break just before the table
-	if (m_ps->m_isParagraphPageBreak && !m_ps->m_inSubDocument)  // No hard page-breaks in sub-documents
-		propList.insert("fo:break-before", "page");
-	else if (m_ps->m_isParagraphColumnBreak)
-		propList.insert("fo:break-before", "column");
+	_insertBreakIfNecessary(propList);
 	m_ps->m_isParagraphColumnBreak = false;
 	m_ps->m_isParagraphPageBreak = false;
 
--- src/lib/WPXContentListener.h	21 Sep 2007 10:52:17 -0000	1.10.4.1
+++ src/lib/WPXContentListener.h	18 Jul 2008 12:56:17 -0000	1.10.4.3
@@ -89,7 +89,7 @@
 	uint32_t m_cellAttributeBits;
 	uint8_t m_paragraphJustificationBeforeTable;
 	
-	std::list<WPXPageSpan>::iterator m_nextPageSpanIter;
+	unsigned m_currentPage;
 	int m_numPagesRemainingInSpan;
 
 	bool m_sectionAttributesChanged;
@@ -193,6 +193,9 @@
 
 	const float _getNextTabStop() const;
 	const float _getPreviousTabStop() const;
+
+	void _insertBreakIfNecessary(WPXPropertyList &propList);
+	
 private:
 	WPXContentListener(const WPXContentListener&);
 	WPXContentListener& operator=(const WPXContentListener&);
--- src/lib/WPXStreamImplementation.h	5 May 2007 12:29:03 -0000	1.2
+++ src/lib/WPXStreamImplementation.h	15 Feb 2008 15:52:39 -0000	1.2.4.1
@@ -38,8 +38,6 @@
 	bool atEOS();
 
 	bool isOLEStream();
-	WPXInputStream *getDocumentOLEStream(const char * name);
-	/* This method will be replaced by the above method in next release cycle */
 	WPXInputStream *getDocumentOLEStream();
 
 private:
@@ -62,8 +60,6 @@
 	bool atEOS();
 
 	bool isOLEStream();
-	WPXInputStream *getDocumentOLEStream(const char * name);
-	/* This method will be replaced by the above method in next release cycle */
 	WPXInputStream *getDocumentOLEStream();
 
 private:

Places

File libwpd-0.8.14-post.patch of Package mingw32-libwpd (Revision e58f8a884a2084ccfeca1f7c82b0a263)

Places