head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.4 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q1:1.1.0.12 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.10 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.8 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.6 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.4 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.2 pkgsrc-2010Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2012.04.07.15.08.02; author wiz; state dead; branches; next 1.1; 1.1 date 2010.11.25.10.52.19; author wiz; state Exp; branches; next ; desc @@ 1.2 log @Update to 0.2.4: Bump version for possible release Update doxygen.cfg file Ignore the unprintable characters which can appear in the text. Ignore some more files Add -Weffc++ option for GCC to avoid producing crappy code :) Fix build inside a new LibreOffice Add Laurent to main authors (my apology for this forgetful attitude) Fix distcheck in build/win32 Fixing MSVC build Bump version for a possible release + remove autopackage that nobody uses anyway Update of src/conv/ by using libwpd/src/conv as model. Small changes: - in WPS4.cpp: correction of an uninitialized variable, - in WPS8.cpp: small improvement of the footnote/endnote display, - in WPSContentListener.cpp: check that the lists are closed before closing a section. Plant some .gitignore files all around the place Generate ChangeLog on make dist Fix callgraph when footnotes are present check that the property remains in the FOD zone (patch Laurent Alonso) Fix different errors (patch Laurent Alonso) Fix some debug build warnings/errors Cleanup and rewrite of build system (patch Tomas Chvatal) Fix windows gcc build of libwps inside LibreOffice tree (patch Jan Holesovsky ) It seems that cfod 0x54 is legitimate (patch Urmas D. ) Update configure.ac to new syntax. Patch of Tomas Chvatal Rename configure.in to configure.ac Patch of Tomas Chvatal Fix makefile.am's to new syntax. Patch of Tomas Chvatal Fix gcc-4.6 build @ text @$NetBSD: patch-aa,v 1.1 2010/11/25 10:52:19 wiz Exp $ _U is defined in a NetBSD internal header. --- src/conv/raw/RawListener.cpp.orig 2010-11-09 08:36:50.000000000 +0000 +++ src/conv/raw/RawListener.cpp @@@@ -28,7 +28,7 @@@@ #include #include "RawListener.h" -#define _U(M, L) \ +#define _RLU(M, L) \ if (!m_printCallgraphScore) \ __iuprintf M; \ else \ @@@@ -148,7 +148,7 @@@@ void RawListenerImpl::setDocumentMetaDat void RawListenerImpl::startDocument() { - _U(("startDocument()\n"), LC_START_DOCUMENT); + _RLU(("startDocument()\n"), LC_START_DOCUMENT); } void RawListenerImpl::endDocument() @@@@ -163,7 +163,7 @@@@ void RawListenerImpl::definePageStyle(co void RawListenerImpl::openPageSpan(const WPXPropertyList &propList) { - _U(("openPageSpan(%s)\n", getPropString(propList).cstr()), + _RLU(("openPageSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_PAGE_SPAN); } @@@@ -175,7 +175,7 @@@@ void RawListenerImpl::closePageSpan() void RawListenerImpl::openHeader(const WPXPropertyList &propList) { - _U(("openHeader(%s)\n", + _RLU(("openHeader(%s)\n", getPropString(propList).cstr()), LC_OPEN_HEADER_FOOTER); } @@@@ -188,7 +188,7 @@@@ void RawListenerImpl::closeHeader() void RawListenerImpl::openFooter(const WPXPropertyList &propList) { - _U(("openFooter(%s)\n", + _RLU(("openFooter(%s)\n", getPropString(propList).cstr()), LC_OPEN_HEADER_FOOTER); } @@@@ -206,7 +206,7 @@@@ void RawListenerImpl::defineParagraphSty void RawListenerImpl::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) { - _U(("openParagraph(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), + _RLU(("openParagraph(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), LC_OPEN_PARAGRAPH); } @@@@ -222,7 +222,7 @@@@ void RawListenerImpl::defineCharacterSty void RawListenerImpl::openSpan(const WPXPropertyList &propList) { - _U(("openSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_SPAN); + _RLU(("openSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_SPAN); } void RawListenerImpl::closeSpan() @@@@ -237,7 +237,7 @@@@ void RawListenerImpl::defineSectionStyle void RawListenerImpl::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { - _U(("openSection(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_SECTION); + _RLU(("openSection(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_SECTION); } void RawListenerImpl::closeSection() @@@@ -283,13 +283,13 @@@@ void RawListenerImpl::defineUnorderedLis void RawListenerImpl::openOrderedListLevel(const WPXPropertyList &propList) { - _U(("openOrderedListLevel(%s)\n", getPropString(propList).cstr()), + _RLU(("openOrderedListLevel(%s)\n", getPropString(propList).cstr()), LC_OPEN_ORDERED_LIST_LEVEL); } void RawListenerImpl::openUnorderedListLevel(const WPXPropertyList &propList) { - _U(("openUnorderedListLevel(%s)\n", getPropString(propList).cstr()), + _RLU(("openUnorderedListLevel(%s)\n", getPropString(propList).cstr()), LC_OPEN_UNORDERED_LIST_LEVEL); } @@@@ -306,7 +306,7 @@@@ void RawListenerImpl::closeUnorderedList void RawListenerImpl::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) { - _U(("openListElement(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), + _RLU(("openListElement(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), LC_OPEN_LIST_ELEMENT); } @@@@ -317,7 +317,7 @@@@ void RawListenerImpl::closeListElement() void RawListenerImpl::openFootnote(const WPXPropertyList &propList) { - _U(("openFootnote(%s)\n", getPropString(propList).cstr()), + _RLU(("openFootnote(%s)\n", getPropString(propList).cstr()), LC_OPEN_FOOTNOTE); } @@@@ -328,7 +328,7 @@@@ void RawListenerImpl::closeFootnote() void RawListenerImpl::openEndnote(const WPXPropertyList &propList) { - _U(("openEndnote(number: %s)\n", getPropString(propList).cstr()), + _RLU(("openEndnote(number: %s)\n", getPropString(propList).cstr()), LC_OPEN_ENDNOTE); } @@@@ -339,7 +339,7 @@@@ void RawListenerImpl::closeEndnote() void RawListenerImpl::openComment(const WPXPropertyList &propList) { - _U(("openComment(%s)\n", getPropString(propList).cstr()), + _RLU(("openComment(%s)\n", getPropString(propList).cstr()), LC_OPEN_COMMENT); } @@@@ -350,7 +350,7 @@@@ void RawListenerImpl::closeComment() void RawListenerImpl::openTextBox(const WPXPropertyList &propList) { - _U(("openTextBox(%s)\n", getPropString(propList).cstr()), + _RLU(("openTextBox(%s)\n", getPropString(propList).cstr()), LC_OPEN_TEXT_BOX); } @@@@ -361,12 +361,12 @@@@ void RawListenerImpl::closeTextBox() void RawListenerImpl::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { - _U(("openTable(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_TABLE); + _RLU(("openTable(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_TABLE); } void RawListenerImpl::openTableRow(const WPXPropertyList &propList) { - _U(("openTableRow(%s)\n", getPropString(propList).cstr()), + _RLU(("openTableRow(%s)\n", getPropString(propList).cstr()), LC_OPEN_TABLE_ROW); } @@@@ -377,7 +377,7 @@@@ void RawListenerImpl::closeTableRow() void RawListenerImpl::openTableCell(const WPXPropertyList &propList) { - _U(("openTableCell(%s)\n", getPropString(propList).cstr()), + _RLU(("openTableCell(%s)\n", getPropString(propList).cstr()), LC_OPEN_TABLE_CELL); } @@@@ -398,7 +398,7 @@@@ void RawListenerImpl::closeTable() void RawListenerImpl::openFrame(const WPXPropertyList &propList) { - _U(("openFrame(%s)\n", getPropString(propList).cstr()), + _RLU(("openFrame(%s)\n", getPropString(propList).cstr()), LC_OPEN_FRAME); } @ 1.1 log @Update to 0.2.0: changes undocumented, but probably related to libwpd-0.9.0 update. @ text @d1 1 a1 1 $NetBSD$ @