Menu
▾
▴
libwpd-cvs — CVS commit messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(4) |
Jun
(28) |
Jul
(15) |
Aug
(23) |
Sep
(2) |
Oct
(13) |
Nov
(26) |
Dec
(30) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(1) |
Feb
(2) |
Mar
(5) |
Apr
(4) |
May
(70) |
Jun
(32) |
Jul
(27) |
Aug
(25) |
Sep
(8) |
Oct
(16) |
Nov
(30) |
Dec
(30) |
| 2007 |
Jan
(17) |
Feb
(7) |
Mar
(6) |
Apr
(36) |
May
(19) |
Jun
(82) |
Jul
(99) |
Aug
(44) |
Sep
(60) |
Oct
(106) |
Nov
(47) |
Dec
(37) |
| 2008 |
Jan
(5) |
Feb
(5) |
Mar
(4) |
Apr
(16) |
May
(2) |
Jun
|
Jul
(20) |
Aug
(5) |
Sep
|
Oct
(95) |
Nov
(104) |
Dec
(23) |
| 2009 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(8) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(1) |
Jun
(46) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Fridrich S. <str...@us...> - 2010-06-03 08:03:07
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29066/filter Modified Files: OdgExporter.cxx Log Message: use draw:transform instead of svg:transform Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- OdgExporter.cxx 14 Sep 2009 08:45:44 -0000 1.36 +++ OdgExporter.cxx 3 Jun 2010 08:02:55 -0000 1.37 @@ -305,7 +305,7 @@ sValue.append("translate("); sValue.append(doubleToString(propList["svg:cx"]->getDouble() - propList["svg:rx"]->getDouble() - deltax)); sValue.append("in, "); sValue.append(doubleToString(propList["svg:cy"]->getDouble() - propList["svg:ry"]->getDouble() - deltay)); sValue.append("in)"); - pDrawEllipseElement->addAttribute("svg:transform", sValue); + pDrawEllipseElement->addAttribute("draw:transform", sValue); } else { |
|
From: Fridrich S. <str...@us...> - 2010-05-03 08:23:27
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14142/src/lib Modified Files: WP6ContentListener.cpp WP6GraphicsCachedFileDataPacket.cpp Log Message: Prevent a null pointer crash when graphics data points to emty object Index: WP6GraphicsCachedFileDataPacket.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6GraphicsCachedFileDataPacket.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- WP6GraphicsCachedFileDataPacket.cpp 18 Jul 2008 13:03:02 -0000 1.8 +++ WP6GraphicsCachedFileDataPacket.cpp 3 May 2010 08:23:17 -0000 1.9 @@ -46,6 +46,7 @@ m_data = 0; if (m_object) delete m_object; + m_object = 0; } void WP6GraphicsCachedFileDataPacket::_readContents(WPXInputStream *input, WPXEncryption *encryption) Index: WP6ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ContentListener.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- WP6ContentListener.cpp 3 Dec 2008 13:40:34 -0000 1.70 +++ WP6ContentListener.cpp 3 May 2010 08:23:17 -0000 1.71 @@ -1647,7 +1647,8 @@ { WPXPropertyList propList; propList.insert("libwpd:mimetype", "image/x-wpg"); - m_documentInterface->insertBinaryObject(propList, *(gcfdPacket->getBinaryObject())); + if (gcfdPacket->getBinaryObject()) + m_documentInterface->insertBinaryObject(propList, *(gcfdPacket->getBinaryObject())); } } |
|
From: Fridrich S. <str...@us...> - 2010-04-14 08:39:22
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7190/filter Modified Files: WordPerfectCollector.cxx Log Message: actually allow to build with libwpg :) Index: WordPerfectCollector.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- WordPerfectCollector.cxx 13 Apr 2010 08:24:14 -0000 1.69 +++ WordPerfectCollector.cxx 14 Apr 2010 08:39:12 -0000 1.70 @@ -28,6 +28,10 @@ * Corel Corporation or Corel Corporation Limited." */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <libwpd/libwpd.h> #include <string.h> // for strcmp #include <string> |
|
From: Fridrich S. <str...@us...> - 2010-04-14 08:39:20
|
Update of /cvsroot/libwpd/writerperfect In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7190 Modified Files: configure.in Log Message: actually allow to build with libwpg :) Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/writerperfect/configure.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- configure.in 13 Apr 2010 08:24:14 -0000 1.23 +++ configure.in 14 Apr 2010 08:39:12 -0000 1.24 @@ -89,15 +89,16 @@ test_libwpg=true AC_ARG_WITH(libwpg, - [ --with-libwpg Use libwpg for conversion of WordPerfect Graphics], - if test "x$withval" != xyes; then + [ --without-libwpg Do not use libwpg for conversion of WordPerfect Graphics (embedded images will not be converted)], + if test "x$withval" = xno; then test_libwpg=false - AC_DEFINE([USE_LIBWPG], [1], [Whether to use libwpg for conversion of WordPerfect Graphics]) fi ) if test "x$test_libwpg" = "xtrue"; then + AC_DEFINE([USE_LIBWPG], [1], [Whether to use libwpg for conversion of WordPerfect Graphics]) + PKG_CHECK_MODULES(WRITERPERFECTWPG,[ libwpg-0.2 >= $LIBWPG_REQUIRED_VERSION ]) |
|
From: Fridrich S. <str...@us...> - 2010-04-13 08:24:22
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9352/filter Modified Files: Makefile.am WordPerfectCollector.cxx Log Message: Allow build wpg2odt when required libwpg is not present Index: WordPerfectCollector.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- WordPerfectCollector.cxx 3 Dec 2008 13:00:31 -0000 1.68 +++ WordPerfectCollector.cxx 13 Apr 2010 08:24:14 -0000 1.69 @@ -36,14 +36,16 @@ #include "DocumentElement.hxx" #include "TextRunStyle.hxx" #include "FontStyle.hxx" -#include "GraphicsStyle.hxx" #include "ListStyle.hxx" #include "PageSpan.hxx" #include "SectionStyle.hxx" #include "TableStyle.hxx" #include "FilterInternal.hxx" #include "WriterProperties.hxx" +#ifdef USE_LIBWPG +#include "GraphicsStyle.hxx" #include "OdgExporter.hxx" +#endif #include "InternalHandler.hxx" _WriterDocumentState::_WriterDocumentState() : @@ -1234,6 +1236,7 @@ if (propList["libwpd:mimetype"]->getStr() == "image/x-wpg") { +#ifdef USE_LIBWPG std::vector<DocumentElement *> tmpContentElements; InternalHandler tmpHandler(&tmpContentElements); OdgExporter exporter(&tmpHandler, true); @@ -1250,6 +1253,7 @@ mpCurrentContentElements->push_back(*iter); mpCurrentContentElements->push_back(new TagCloseElement("draw:object")); } +#endif } else { Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 29 Jun 2007 11:21:47 -0000 1.8 +++ Makefile.am 13 Apr 2010 08:24:14 -0000 1.9 @@ -1,8 +1,30 @@ +if USE_LIBWPG + +writerperfect_wpg_sources = \ + GraphicsStyle.cxx \ + GraphicsStyle.hxx \ + OdgExporter.cxx \ + OdgExporter.hxx + +writerperfect_wpg_cxxflags = \ + $(WRITERPERFECTWPG_CXXFLAGS) + +writerperfect_wpg_ldflags = \ + $(WRITERPERFECTWPG_LIBS) + +else + +writerperfect_wpg_sources = +writerperfect_wpg_cxxflags = +writerperfect_wpg_ldflags = + +endif + noinst_LTLIBRARIES = libwriterperfect-1.la -AM_CXXFLAGS = $(WRITERPERFECT_CXXFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = $(WRITERPERFECTCORE_CXXFLAGS) $(writerperfect_wpg_cxxflags) $(DEBUG_CXXFLAGS) -libwriterperfect_1_la_LIBADD = $(WRITERPERFECT_LIBS) +libwriterperfect_1_la_LIBADD = $(WRITERPERFECTCORE_LIBS) $(writerperfect_wpg_ldflags) libwriterperfect_1_la_SOURCES = \ FilterInternal.hxx \ Style.hxx \ @@ -12,14 +34,10 @@ DocumentHandler.hxx \ FontStyle.cxx \ FontStyle.hxx \ - GraphicsStyle.cxx \ - GraphicsStyle.hxx \ InternalHandler.cxx \ InternalHandler.hxx \ ListStyle.cxx \ ListStyle.hxx \ - OdgExporter.cxx \ - OdgExporter.hxx \ PageSpan.cxx \ PageSpan.hxx \ SectionStyle.cxx \ @@ -29,4 +47,6 @@ TextRunStyle.cxx \ TextRunStyle.hxx \ WordPerfectCollector.cxx \ - WordPerfectCollector.hxx + WordPerfectCollector.hxx \ + $(writerperfect_wpg_sources) + |
|
From: Fridrich S. <str...@us...> - 2010-04-13 08:24:22
|
Update of /cvsroot/libwpd/writerperfect/cmdline In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9352/cmdline Modified Files: Makefile.am Log Message: Allow build wpg2odt when required libwpg is not present Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/writerperfect/cmdline/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.am 15 Nov 2007 15:06:47 -0000 1.9 +++ Makefile.am 13 Apr 2010 08:24:14 -0000 1.10 @@ -1,9 +1,27 @@ -bin_PROGRAMS = wpd2odt wpg2odg +if USE_LIBWPG +writerperfectwpg_program = wpg2odg +writerperfectwpg_cxxflags = $(WRITERPERFECTWPG_CXXFLAGS) +writerperfectwpg_ldadd = $(WRITERPERFECTWPG_LIBS) +else +writerperfectwpg_program = +writerperfectwpg_cxxflags = +writerperfectwpg_ldadd = +endif -AM_CXXFLAGS = $(WRITERPERFECT_CXXFLAGS) $(DEBUG_CXXFLAGS) -I$(top_srcdir)/filter -I$(top_srcdir) +bin_PROGRAMS = wpd2odt $(writerperfectwpg_program) + +if USE_GSF_OUTPUT +writerperfectgsf_cxxflags = $(WRITERPERFECTGSF_CXXFLAGS) +writerperfectgsf_ldadd = $(WRITERPERFECTGSF_LIBS) +else +writerperfectgsf_cxxflags = +writerperfectgsf_ldadd = +endif + +AM_CXXFLAGS = $(WRITERPERFECTCORE_CXXFLAGS) $(writerperfectgsf_cxxflags) $(writerperfectwpg_cxxflags) $(DEBUG_CXXFLAGS) -I$(top_srcdir)/filter -I$(top_srcdir) wpd2odt_DEPENDENCIES = @WPD2ODT_WIN32_RESOURCE@ ../filter/libwriterperfect-1.la -wpd2odt_LDADD = $(WRITERPERFECT_LIBS) @WPD2ODT_WIN32_RESOURCE@ ../filter/libwriterperfect-1.la +wpd2odt_LDADD = @WPD2ODT_WIN32_RESOURCE@ ../filter/libwriterperfect-1.la $(WRITERPERFECTCORE_LIBS) $(writerperfectwpg_ldadd) $(writerperfectgsf_ldadd) if STATIC_TOOLS wpd2odt_LDFLAGS = -all-static endif @@ -20,7 +38,7 @@ wpd2odt.cxx wpg2odg_DEPENDENCIES = @WPG2ODG_WIN32_RESOURCE@ ../filter/libwriterperfect-1.la -wpg2odg_LDADD = $(WRITERPERFECT_LIBS) @WPG2ODG_WIN32_RESOURCE@ ../filter/libwriterperfect-1.la +wpg2odg_LDADD = @WPG2ODG_WIN32_RESOURCE@ ../filter/libwriterperfect-1.la $(WRITERPERFECTCORE_LIBS) $(writerperfectwpg_ldadd) $(writerperfectgsf_ldadd) if STATIC_TOOLS wpg2odg_LDFLAGS = -all-static endif |
|
From: Fridrich S. <str...@us...> - 2009-09-14 08:45:54
|
Update of /cvsroot/libwpd/writerperfect/filter In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28555/filter Modified Files: OdgExporter.cxx Log Message: Disable dash array since it is a work in progress right now Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- OdgExporter.cxx 7 Sep 2009 09:51:04 -0000 1.35 +++ OdgExporter.cxx 14 Sep 2009 08:45:44 -0000 1.36 @@ -494,7 +494,8 @@ void OdgExporter::writeGraphicsStyle() { - if(!mxStyle["libwpg:stroke-solid"]->getInt() && (mxDashArray.count() >=2 ) ) +#if 0 + if(mxStyle["libwpg:stroke-solid"] && !mxStyle["libwpg:stroke-solid"]->getInt() && (mxDashArray.count() >=2 ) ) { // ODG only supports dashes with the same length of spaces inbetween // here we take the first space and assume everything else the same @@ -521,7 +522,7 @@ mGraphicsStrokeDashStyles.push_back(pDrawStrokeDashElement); mGraphicsStrokeDashStyles.push_back(new TagCloseElement("draw:stroke-dash")); } - +#endif if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "gradient" && mxGradient.count() >= 2) { TagOpenElement *pDrawGradientElement = new TagOpenElement("draw:gradient"); |
|
From: Fridrich S. <str...@us...> - 2009-09-10 20:01:34
|
Update of /cvsroot/libwpd/libwpd2/src/conv/html In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3500/src/conv/html Modified Files: HtmlDocumentGenerator.cpp HtmlDocumentGenerator.h Log Message: No need to work around anymore, a CVS version of DJGPP is compiling std::cout << correctly Index: HtmlDocumentGenerator.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/HtmlDocumentGenerator.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- HtmlDocumentGenerator.h 4 Sep 2009 14:50:10 -0000 1.6 +++ HtmlDocumentGenerator.h 10 Sep 2009 20:01:25 -0000 1.7 @@ -93,8 +93,8 @@ private: bool m_ignore; - std::ostringstream *m_pOutputStream; - std::ostringstream m_footNotesStream, m_endNotesStream, m_commentsStream, m_textBoxesStream, m_documentBodyStream, m_dummyStream; + std::ostream *m_pOutputStream; + std::ostringstream m_footNotesStream, m_endNotesStream, m_commentsStream, m_textBoxesStream, m_dummyStream; unsigned m_footNotesCount, m_endNotesCount, m_commentsCount, m_textBoxesCount; unsigned m_commentNumber, m_textBoxNumber; Index: HtmlDocumentGenerator.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/HtmlDocumentGenerator.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- HtmlDocumentGenerator.cpp 4 Sep 2009 14:50:09 -0000 1.7 +++ HtmlDocumentGenerator.cpp 10 Sep 2009 20:01:25 -0000 1.8 @@ -34,7 +34,7 @@ HtmlDocumentGenerator::HtmlDocumentGenerator() : m_ignore(false), - m_pOutputStream(NULL), + m_pOutputStream(&std::cout), m_footNotesCount(0), m_endNotesCount(0), m_commentsCount(0), @@ -42,7 +42,6 @@ m_commentNumber(1), m_textBoxNumber(1) { - m_pOutputStream = &m_documentBodyStream; } HtmlDocumentGenerator::~HtmlDocumentGenerator() @@ -103,8 +102,6 @@ } *m_pOutputStream << "</body>" << std::endl; *m_pOutputStream << "</html>" << std::endl; - - printf("%s", m_pOutputStream->str().c_str()); } void HtmlDocumentGenerator::openHeader(const WPXPropertyList & /* propList */) @@ -300,7 +297,7 @@ if (!(--m_footNotesCount)) { *m_pOutputStream << "<p/>" << std::endl; - m_pOutputStream = &m_documentBodyStream; + m_pOutputStream = &std::cout; } } } @@ -332,7 +329,7 @@ if (!(--m_endNotesCount)) { *m_pOutputStream << "<p/>" << std::endl; - m_pOutputStream = &m_documentBodyStream; + m_pOutputStream = &std::cout; } } } @@ -360,7 +357,7 @@ if (!(--m_commentsCount)) { *m_pOutputStream << "<p/>" << std::endl; - m_pOutputStream = &m_documentBodyStream; + m_pOutputStream = &std::cout; } } } @@ -389,7 +386,7 @@ if (!(--m_textBoxesCount)) { *m_pOutputStream << "<p/>" << std::endl; - m_pOutputStream = &m_documentBodyStream; + m_pOutputStream = &std::cout; } } } |
|
From: Fridrich S. <str...@us...> - 2009-09-07 09:51:16
|
Update of /cvsroot/libwpd/writerperfect/filter In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1912/filter Modified Files: OdgExporter.cxx OdgExporter.hxx Log Message: don't consider the dash-array before it is correctly reimplemented Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- OdgExporter.cxx 7 Sep 2009 08:10:44 -0000 1.34 +++ OdgExporter.cxx 7 Sep 2009 09:51:04 -0000 1.35 @@ -242,10 +242,9 @@ mpHandler->endDocument(); } -void OdgExporter::setStyle(const libwpg::WPGDashArray& dashArray, const ::WPXPropertyListVector& gradient, const ::WPXPropertyList & propList) +void OdgExporter::setStyle(const ::WPXPropertyListVector& gradient, const ::WPXPropertyList & propList) { mxStyle = propList; - mxDashArray = dashArray; mxGradient = gradient; } Index: OdgExporter.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.hxx,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- OdgExporter.hxx 7 Sep 2009 08:10:44 -0000 1.16 +++ OdgExporter.hxx 7 Sep 2009 09:51:04 -0000 1.17 @@ -46,7 +46,7 @@ void startEmbeddedGraphics(const ::WPXPropertyList& /*propList*/) {} void endEmbeddedGraphics() {} - void setStyle(const libwpg::WPGDashArray& dashArray, const ::WPXPropertyListVector& gradient, const ::WPXPropertyList &propList); + void setStyle(const ::WPXPropertyListVector& gradient, const ::WPXPropertyList &propList); void drawRectangle(const ::WPXPropertyList &propList); void drawEllipse(const ::WPXPropertyList &propList); |
|
From: Fridrich S. <str...@us...> - 2009-09-07 08:10:53
|
Update of /cvsroot/libwpd/writerperfect/filter In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19628/filter Modified Files: OdgExporter.cxx OdgExporter.hxx Log Message: adapting to the head of libwpg Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- OdgExporter.cxx 10 Dec 2008 12:59:04 -0000 1.33 +++ OdgExporter.cxx 7 Sep 2009 08:10:44 -0000 1.34 @@ -242,7 +242,7 @@ mpHandler->endDocument(); } -void OdgExporter::setStyle(const libwpg::WPGDashArray& dashArray, const libwpg::WPGGradient& gradient, const ::WPXPropertyList & propList) +void OdgExporter::setStyle(const libwpg::WPGDashArray& dashArray, const ::WPXPropertyListVector& gradient, const ::WPXPropertyList & propList) { mxStyle = propList; mxDashArray = dashArray; @@ -541,8 +541,8 @@ sValue.sprintf("%i", (unsigned)(angle*10)); pDrawGradientElement->addAttribute("draw:angle", sValue); - pDrawGradientElement->addAttribute("draw:start-color", mxGradient.stopColor(0).cstr()); - pDrawGradientElement->addAttribute("draw:end-color", mxGradient.stopColor(1).cstr()); + pDrawGradientElement->addAttribute("draw:start-color", mxGradient[0]["svg:stop-color"]->getStr().cstr()); + pDrawGradientElement->addAttribute("draw:end-color", mxGradient[1]["svg:stop-color"]->getStr().cstr()); pDrawGradientElement->addAttribute("draw:start-intensity", "100%"); pDrawGradientElement->addAttribute("draw:end-intensity", "100%"); pDrawGradientElement->addAttribute("draw:border", "0%"); Index: OdgExporter.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.hxx,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- OdgExporter.hxx 5 Dec 2008 15:17:45 -0000 1.15 +++ OdgExporter.hxx 7 Sep 2009 08:10:44 -0000 1.16 @@ -46,7 +46,7 @@ void startEmbeddedGraphics(const ::WPXPropertyList& /*propList*/) {} void endEmbeddedGraphics() {} - void setStyle(const libwpg::WPGDashArray& dashArray, const libwpg::WPGGradient& gradient, const ::WPXPropertyList &propList); + void setStyle(const libwpg::WPGDashArray& dashArray, const ::WPXPropertyListVector& gradient, const ::WPXPropertyList &propList); void drawRectangle(const ::WPXPropertyList &propList); void drawEllipse(const ::WPXPropertyList &propList); @@ -72,7 +72,7 @@ ::WPXPropertyList mxStyle; libwpg::WPGDashArray mxDashArray; - libwpg::WPGGradient mxGradient; + ::WPXPropertyListVector mxGradient; int miGradientIndex; int miDashIndex; int miGraphicsStyleIndex; |
|
From: Fridrich S. <str...@us...> - 2009-09-05 13:40:21
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17419/src/lib Modified Files: Makefile.am WPXString.cpp libwpd_types.h Removed Files: vsnprintf.c Log Message: removing workarounds for bugs fixed in the djgpp 2.04 beta --- vsnprintf.c DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/Makefile.am,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- Makefile.am 3 Sep 2009 08:00:52 -0000 1.115 +++ Makefile.am 5 Sep 2009 13:40:11 -0000 1.116 @@ -440,7 +440,6 @@ $(libwpd_stream_sources) \ $(libwpd_stream_headers) \ makefile.mk \ - vsnprintf.c \ libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def \ libwpd.h.in \ libwpd.rc.in \ Index: WPXString.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXString.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- WPXString.cpp 3 Sep 2009 08:00:54 -0000 1.21 +++ WPXString.cpp 5 Sep 2009 13:40:11 -0000 1.22 @@ -31,12 +31,6 @@ #include <stdarg.h> #include <stdio.h> -#ifdef __DJGPP__ -namespace { -#include "vsnprintf.c" -} -#endif - #define FIRST_BUF_SIZE 128 #ifdef _MSC_VER #define vsnprintf _vsnprintf Index: libwpd_types.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_types.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- libwpd_types.h 3 Sep 2009 08:00:54 -0000 1.5 +++ libwpd_types.h 5 Sep 2009 13:40:11 -0000 1.6 @@ -25,7 +25,7 @@ #ifndef LIBWPD_TYPES_H #define LIBWPD_TYPES_H -#if defined(_MSC_VER) || defined (__DJGPP__) +#if defined(_MSC_VER) typedef signed char int8_t; typedef unsigned char uint8_t; typedef signed short int16_t; |
|
From: Fridrich S. <str...@us...> - 2009-09-04 14:50:20
|
Update of /cvsroot/libwpd/libwpd2/src/conv/html In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27358/src/conv/html Modified Files: HtmlDocumentGenerator.cpp HtmlDocumentGenerator.h Log Message: Working around a crash in std::cout << on DOS Index: HtmlDocumentGenerator.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/HtmlDocumentGenerator.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- HtmlDocumentGenerator.h 3 Dec 2008 05:28:07 -0000 1.5 +++ HtmlDocumentGenerator.h 4 Sep 2009 14:50:10 -0000 1.6 @@ -93,8 +93,8 @@ private: bool m_ignore; - std::ostream *m_pOutputStream; - std::ostringstream m_footNotesStream, m_endNotesStream, m_commentsStream, m_textBoxesStream, m_dummyStream; + std::ostringstream *m_pOutputStream; + std::ostringstream m_footNotesStream, m_endNotesStream, m_commentsStream, m_textBoxesStream, m_documentBodyStream, m_dummyStream; unsigned m_footNotesCount, m_endNotesCount, m_commentsCount, m_textBoxesCount; unsigned m_commentNumber, m_textBoxNumber; Index: HtmlDocumentGenerator.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/HtmlDocumentGenerator.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- HtmlDocumentGenerator.cpp 3 Dec 2008 12:30:38 -0000 1.6 +++ HtmlDocumentGenerator.cpp 4 Sep 2009 14:50:09 -0000 1.7 @@ -34,7 +34,7 @@ HtmlDocumentGenerator::HtmlDocumentGenerator() : m_ignore(false), - m_pOutputStream(&std::cout), + m_pOutputStream(NULL), m_footNotesCount(0), m_endNotesCount(0), m_commentsCount(0), @@ -42,6 +42,7 @@ m_commentNumber(1), m_textBoxNumber(1) { + m_pOutputStream = &m_documentBodyStream; } HtmlDocumentGenerator::~HtmlDocumentGenerator() @@ -102,6 +103,8 @@ } *m_pOutputStream << "</body>" << std::endl; *m_pOutputStream << "</html>" << std::endl; + + printf("%s", m_pOutputStream->str().c_str()); } void HtmlDocumentGenerator::openHeader(const WPXPropertyList & /* propList */) @@ -297,7 +300,7 @@ if (!(--m_footNotesCount)) { *m_pOutputStream << "<p/>" << std::endl; - m_pOutputStream = &std::cout; + m_pOutputStream = &m_documentBodyStream; } } } @@ -329,7 +332,7 @@ if (!(--m_endNotesCount)) { *m_pOutputStream << "<p/>" << std::endl; - m_pOutputStream = &std::cout; + m_pOutputStream = &m_documentBodyStream; } } } @@ -357,7 +360,7 @@ if (!(--m_commentsCount)) { *m_pOutputStream << "<p/>" << std::endl; - m_pOutputStream = &std::cout; + m_pOutputStream = &m_documentBodyStream; } } } @@ -386,7 +389,7 @@ if (!(--m_textBoxesCount)) { *m_pOutputStream << "<p/>" << std::endl; - m_pOutputStream = &std::cout; + m_pOutputStream = &m_documentBodyStream; } } } |
|
From: Fridrich S. <str...@us...> - 2009-09-04 13:16:00
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19296/src/lib Modified Files: libwpd_internal.cpp Log Message: Avoid Unnormal as output for WPXDoubleProperty:getStr() Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- libwpd_internal.cpp 10 Dec 2008 23:45:49 -0000 1.44 +++ libwpd_internal.cpp 4 Sep 2009 13:15:48 -0000 1.45 @@ -1142,7 +1142,10 @@ WPXString doubleToString(const double value) { WPXString tempString; - tempString.sprintf("%.4f", value); + if (value < 0.0001 && value > -0.0001) + tempString.sprintf("0.0000"); + else + tempString.sprintf("%.4f", value); std::string decimalPoint(localeconv()->decimal_point); if ((decimalPoint.size() == 0) || (decimalPoint == ".")) return tempString; |
|
From: Fridrich S. <str...@us...> - 2009-09-03 08:01:06
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25004/src/lib Modified Files: Makefile.am WPXString.cpp libwpd_types.h Added Files: vsnprintf.c Log Message: allow compiling of libwpd and related tools for MS DOS using the djgpp tools --- NEW FILE: vsnprintf.c --- /* Copyright (C) 2001 DJ Delorie, see http://www.delorie.com/bin/cvsweb.cgi/djgpp/copying.dj?rev=1.5 for details */ #include <stdio.h> #include <string.h> #include <stdarg.h> #include <limits.h> #include <errno.h> #define _IOWRT 000020 #define _IOSTRG 000400 #define _IONTERM 040000 /* file's handle not hooked by termios */ static __inline__ void __stropenw(FILE *p, char *str, int len) { p->_flag = _IOWRT | _IOSTRG | _IONTERM; p->_ptr = str; p->_cnt = len; } static __inline__ void __strclosew(FILE *p) { *p->_ptr = '\0'; } int vsnprintf(char *str, size_t n, const char *fmt, va_list ap) { FILE _strbuf; int len; /* _cnt is an int in the FILE structure. To prevent wrap-around, we limit * n to between 0 and INT_MAX inclusively. */ if (n > INT_MAX) { errno = EFBIG; return -1; } memset(&_strbuf, 0, sizeof(_strbuf)); /* If n == 0, just querying how much space is needed. */ if (n > 0) __stropenw(&_strbuf, str, n - 1); else __stropenw(&_strbuf, NULL, 0); len = _doprnt(fmt, ap, &_strbuf); /* Ensure nul termination */ if (n > 0) __strclosew(&_strbuf); return len; } Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/Makefile.am,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- Makefile.am 19 Nov 2008 13:15:34 -0000 1.114 +++ Makefile.am 3 Sep 2009 08:00:52 -0000 1.115 @@ -440,6 +440,7 @@ $(libwpd_stream_sources) \ $(libwpd_stream_headers) \ makefile.mk \ + vsnprintf.c \ libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def \ libwpd.h.in \ libwpd.rc.in \ Index: WPXString.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXString.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- WPXString.cpp 4 Dec 2008 23:14:10 -0000 1.20 +++ WPXString.cpp 3 Sep 2009 08:00:54 -0000 1.21 @@ -31,6 +31,12 @@ #include <stdarg.h> #include <stdio.h> +#ifdef __DJGPP__ +namespace { +#include "vsnprintf.c" +} +#endif + #define FIRST_BUF_SIZE 128 #ifdef _MSC_VER #define vsnprintf _vsnprintf Index: libwpd_types.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_types.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- libwpd_types.h 9 Oct 2006 03:50:18 -0000 1.4 +++ libwpd_types.h 3 Sep 2009 08:00:54 -0000 1.5 @@ -25,7 +25,7 @@ #ifndef LIBWPD_TYPES_H #define LIBWPD_TYPES_H -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined (__DJGPP__) typedef signed char int8_t; typedef unsigned char uint8_t; typedef signed short int16_t; |
|
From: Fridrich S. <str...@us...> - 2009-01-09 08:01:29
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7667/src/java Modified Files: test.sh.in Log Message: fix the test for swig version + add a test for gmcs version >= 2.0.0.0 + fix classpath in the tests Index: test.sh.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/test.sh.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- test.sh.in 26 Nov 2008 09:34:08 -0000 1.8 +++ test.sh.in 9 Jan 2009 08:01:21 -0000 1.9 @@ -1,7 +1,7 @@ tmp=`mktemp -d` @WPD2RAW@ @top_srcdir@/src/java/examples/wp_test_document.wpd >$tmp/cpp.out PATH="$PATH:./.libs@WPD2RAW_PATH@" LD_LIBRARY_PATH="./.libs:$LD_LIBRARY_PATH" \ -@JAVA@ -classpath "./wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar:./examples/" wpd2raw @top_srcdir@/src/java/examples/wp_test_document.wpd > $tmp/java.out +@JAVA@ -classpath "./examples/:./wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar:$CLASSPATH" wpd2raw @top_srcdir@/src/java/examples/wp_test_document.wpd > $tmp/java.out diff -uw $tmp/cpp.out $tmp/java.out if [ $? == 0 ]; then echo ok |
|
From: Fridrich S. <str...@us...> - 2009-01-09 08:01:28
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7667 Modified Files: configure.in Log Message: fix the test for swig version + add a test for gmcs version >= 2.0.0.0 + fix classpath in the tests Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/configure.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- configure.in 26 Nov 2008 09:34:08 -0000 1.22 +++ configure.in 9 Jan 2009 08:01:21 -0000 1.23 @@ -10,6 +10,8 @@ SWIG_REQUIRED_VERSION=1.3.30 +GMCS_REQUIRED_VERSION=2.0.0.0 + WPDBINDINGS_VERSION="$WPDBINDINGS_MAJOR_VERSION.$WPDBINDINGS_MINOR_VERSION.$WPDBINDINGS_MICRO_VERSION" if test x$WPDBINDINGS_MICRO_VERSION = x0; then @@ -52,23 +54,23 @@ if test -z "$SWIG"; then AC_MSG_ERROR([*** Could not find swig in your PATH. The libwpd bindings cannot be built.]) fi -AC_MSG_CHECKING([whether swig version is at least $SWIG_REQUIRED_VERSION]) +AC_MSG_CHECKING([whether $SWIG version is at least $SWIG_REQUIRED_VERSION]) SWIG_REAL_VERSION=`$SWIG -version 2>&1| $EGREP "^SWIG\ Version" | $AWK '{ print $3 }'` -if test "`echo $SWIG_REAL_VERSION | cut -d. -f1`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f1`"; then - if test "`echo $SWIG_REAL_VERSION | cut -d. -f2`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f2`"; then - if test "`echo $SWIG_REAL_VERSION | cut -d. -f3`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f3`"; then - AC_MSG_RESULT([$SWIG_REAL_VERSION]) - else - AC_MSG_RESULT([$SWIG_REAL_VERSION]) +AC_MSG_RESULT([$SWIG_REAL_VERSION]) +if test "`echo $SWIG_REAL_VERSION | cut -d. -f1`" -lt "`echo $SWIG_REQUIRED_VERSION | cut -d. -f1`"; then + AC_MSG_ERROR([Too old, visit http://www.swig.org/ for a recent swig version]) +else + if test "`echo $SWIG_REAL_VERSION | cut -d. -f1`" -eq "`echo $SWIG_REQUIRED_VERSION | cut -d. -f1`"; then + if test "`echo $SWIG_REAL_VERSION | cut -d. -f2`" -lt "`echo $SWIG_REQUIRED_VERSION | cut -d. -f2`"; then AC_MSG_ERROR([Too old, visit http://www.swig.org/ for a recent swig version]) + else + if test "`echo $SWIG_REAL_VERSION | cut -d. -f2`" -eq "`echo $SWIG_REQUIRED_VERSION | cut -d. -f2`"; then + if test "`echo $SWIG_REAL_VERSION | cut -d. -f3`" -lt "`echo $SWIG_REQUIRED_VERSION | cut -d. -f3`"; then + AC_MSG_ERROR([Too old, visit http://www.swig.org/ for a recent swig version]) + fi + fi fi - else - AC_MSG_RESULT([$SWIG_REAL_VERSION]) - AC_MSG_ERROR([Too old, visit http://www.swig.org/ for a recent swig version]) fi -else - AC_MSG_RESULT([$SWIG_REAL_VERSION]) - AC_MSG_ERROR([Too old, visit http://www.swig.org/ for a recent swig version]) fi AC_CHECK_CLASSPATH @@ -80,6 +82,12 @@ if test x$GMCS = x; then AC_MSG_ERROR([*** Could not find C-sharp compiler that supports generics.]) fi +AC_MSG_CHECKING([whether $GMCS version is at least $GMCS_REQUIRED_VERSION]) +GMCS_REAL_VERSION=`$GMCS --version 2>&1| $EGREP "^Mono\ C\#\ compiler\ version" | $AWK '{ print $5 }'` +AC_MSG_RESULT([$GMCS_REAL_VERSION]) +if test "`echo $GMCS_REAL_VERSION | cut -d. -f1`" -lt "`echo $GMCS_REQUIRED_VERSION | cut -d. -f1`"; then + AC_MSG_ERROR([Too old, visit http://www.mono-project.com/ for a recent Mono version]) +fi # The gacutil and mono can be besides gmcs PATH="$PATH:`dirname $GMCS`" |
|
From: Fridrich S. <str...@us...> - 2008-12-30 08:24:20
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java/examples In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13116/src/java/examples Modified Files: Makefile.am Log Message: let make check consider whole classpath Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/examples/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.am 23 Nov 2008 17:15:59 -0000 1.9 +++ Makefile.am 30 Dec 2008 08:24:14 -0000 1.10 @@ -3,7 +3,7 @@ all: wpd2raw.class: - @JAVAC@ -d $(top_builddir)/src/java/examples -classpath $(top_builddir)/src/java/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar \ + @JAVAC@ -d $(top_builddir)/src/java/examples -classpath $$CLASSPATH:$(top_builddir)/src/java/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar \ $(top_srcdir)/src/java/examples/wpd2raw.java $(top_srcdir)/src/java/examples/RawListenerImpl.java check: wpd2raw.class |
|
From: Fridrich S. <str...@us...> - 2008-12-28 22:23:05
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18977/src/java Modified Files: Makefile.am Log Message: adapting to libwpd CVS Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile.am 25 Nov 2008 21:02:19 -0000 1.23 +++ Makefile.am 28 Dec 2008 22:22:59 -0000 1.24 @@ -53,7 +53,7 @@ CXXFLAGS += $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) LDFLAGS += $(WPDBINDINGS_LIBS) -JAVA_SWIG = SWIGTYPE_p_size_t.java SWIGTYPE_p_unsigned_char.java WPDConfidence.java wpdConstants.java WPDFileFormat.java wpd.java \ +JAVA_SWIG = SWIGTYPE_p_unsigned_long.java SWIGTYPE_p_unsigned_char.java WPDConfidence.java wpdConstants.java WPDFileFormat.java wpd.java \ wpdJNI.java WPDocument.java WPDPasswordMatch.java WPDResult.java WPXBinaryData.java WPXDocumentInterface.java \ WPXFileStream.java WPXInputStream.java WPXPropertyFactory.java WPXProperty.java WPXPropertyList_Iter.java WPXPropertyList.java \ WPXPropertyListVector_Iter.java WPXPropertyListVector.java WPX_SEEK_TYPE.java WPXString.java WPXStringStream.java WPXUnit.java |
|
From: Fridrich S. <str...@us...> - 2008-12-28 22:23:04
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18977/src/csharp Modified Files: Makefile.am Log Message: adapting to libwpd CVS Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.am 25 Nov 2008 21:02:19 -0000 1.16 +++ Makefile.am 28 Dec 2008 22:22:59 -0000 1.17 @@ -52,7 +52,7 @@ CXXFLAGS += $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) LDFLAGS += $(WPDBINDINGS_LIBS) -SHARP_SWIG = SWIGTYPE_p_size_t.cs SWIGTYPE_p_unsigned_char.cs WPDConfidence.cs wpd.cs \ +SHARP_SWIG = SWIGTYPE_p_unsigned_long.cs SWIGTYPE_p_unsigned_char.cs WPDConfidence.cs wpd.cs \ WPDFileFormat.cs WPDocument.cs WPDPasswordMatch.cs wpdPINVOKE.cs WPDResult.cs WPXBinaryData.cs \ WPXDocumentInterface.cs WPXFileStream.cs WPXInputStream.cs WPXProperty.cs WPXPropertyFactory.cs \ WPXPropertyList.cs WPXPropertyList_Iter.cs WPXPropertyListVector.cs WPXPropertyListVector_Iter.cs \ |
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5908/src/lib Modified Files: WP1PictureGroup.cpp WP3ResourceFork.cpp WP5GraphicsInformationPacket.h WP6ExtendedDocumentSummaryPacket.cpp WPXBinaryData.cpp WPXBinaryData.h WPXEncryption.cpp WPXEncryption.h WPXMemoryStream.cpp WPXMemoryStream.h WPXPropertyListVector.cpp WPXPropertyListVector.h WPXStream.h WPXStreamImplementation.cpp WPXStreamImplementation.h WPXTable.h libwpd-0.9.def libwpd-stream-0.9.def libwpd.h.in libwpd_internal.cpp Log Message: replacing size_t with unsigned long, so that the names are mangled the same way on x86 and x86_64 + update the def files Index: WPXTable.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXTable.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- WPXTable.h 8 Dec 2007 11:17:48 -0000 1.19 +++ WPXTable.h 10 Dec 2008 23:45:49 -0000 1.20 @@ -76,7 +76,7 @@ WPXTableList & operator=(const WPXTableList & tableList); virtual ~WPXTableList(); - WPXTable * operator[](size_t i) { return (*m_tableList)[i]; } + WPXTable * operator[](unsigned long i) { return (*m_tableList)[i]; } void add(WPXTable *table) { m_tableList->push_back(table); } private: Index: libwpd.h.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libwpd.h.in 27 Jul 2008 20:38:50 -0000 1.2 +++ libwpd.h.in 10 Dec 2008 23:45:49 -0000 1.3 @@ -33,6 +33,5 @@ #include "WPXDocumentInterface.h" #include "WPDocument.h" -#include "WPXBinaryData.h" #endif /* LIBWPD_H */ Index: WP5GraphicsInformationPacket.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5GraphicsInformationPacket.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WP5GraphicsInformationPacket.h 13 Oct 2008 15:38:29 -0000 1.6 +++ WP5GraphicsInformationPacket.h 10 Dec 2008 23:45:49 -0000 1.7 @@ -37,7 +37,7 @@ ~WP5GraphicsInformationPacket(); void _readContents(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataSize); const std::vector<WPXBinaryData *> &getImages() const { return m_images; } - const WPXBinaryData *getImage( size_t imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return NULL; } + const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return NULL; } private: std::vector<WPXBinaryData *> m_images; Index: WP6ExtendedDocumentSummaryPacket.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ExtendedDocumentSummaryPacket.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- WP6ExtendedDocumentSummaryPacket.cpp 22 Nov 2007 12:20:40 -0000 1.38 +++ WP6ExtendedDocumentSummaryPacket.cpp 10 Dec 2008 23:45:49 -0000 1.39 @@ -57,7 +57,7 @@ for(unsigned i=0; i<(unsigned)m_dataSize; i++) m_streamData[i] = readU8(input, encryption); - m_stream = new WPXMemoryInputStream(m_streamData, (size_t)m_dataSize); + m_stream = new WPXMemoryInputStream(m_streamData, (unsigned long)m_dataSize); } void WP6ExtendedDocumentSummaryPacket::parse(WP6Listener *listener) const Index: WP3ResourceFork.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ResourceFork.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- WP3ResourceFork.cpp 19 Nov 2008 13:15:34 -0000 1.9 +++ WP3ResourceFork.cpp 10 Dec 2008 23:45:49 -0000 1.10 @@ -76,7 +76,7 @@ input->seek(offsetToData, WPX_SEEK_SET); uint32_t resourceDataSize = readU32(input, encryption, true); - size_t oldEncryptionOffset = 0; + unsigned long oldEncryptionOffset = 0; unsigned char oldEncryptionMaskBase = 0; if (encryption) { @@ -91,7 +91,7 @@ } WPXBinaryData resourceData; - for (size_t k = 0; k < (size_t)resourceDataSize && !input->atEOS(); k++) + for (unsigned long k = 0; k < (unsigned long)resourceDataSize && !input->atEOS(); k++) resourceData.append((unsigned char)readU8(input, encryption)); if (encryption) Index: WPXEncryption.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXEncryption.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WPXEncryption.h 22 Oct 2008 12:17:51 -0000 1.3 +++ WPXEncryption.h 10 Dec 2008 23:45:49 -0000 1.4 @@ -28,21 +28,20 @@ #include "libwpd_types.h" #include "WPXString.h" -#include <stdio.h> class WPXInputStream; class WPXEncryption { public: - WPXEncryption(const char *password, const size_t encryptionStartOffset = 0); + WPXEncryption(const char *password, const unsigned long encryptionStartOffset = 0); ~WPXEncryption(); - const unsigned char *readAndDecrypt(WPXInputStream *input, size_t numBytes, size_t &numBytesRead); + const unsigned char *readAndDecrypt(WPXInputStream *input, unsigned long numBytes, unsigned long &numBytesRead); uint16_t getCheckSum() const; - void setEncryptionStartOffset(size_t encryptionStartOffset) { m_encryptionStartOffset = encryptionStartOffset; } - size_t getEncryptionStartOffset() const { return m_encryptionStartOffset; } + void setEncryptionStartOffset(unsigned long encryptionStartOffset) { m_encryptionStartOffset = encryptionStartOffset; } + unsigned long getEncryptionStartOffset() const { return m_encryptionStartOffset; } void setEncryptionMaskBase(unsigned char encryptionMaskBase) { m_encryptionMaskBase = encryptionMaskBase; } unsigned char getEncryptionMaskBase() const { return m_encryptionMaskBase; } @@ -52,7 +51,7 @@ private: unsigned char *m_buffer; WPXString m_password; - size_t m_encryptionStartOffset; + unsigned long m_encryptionStartOffset; unsigned char m_encryptionMaskBase; }; Index: WPXMemoryStream.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXMemoryStream.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- WPXMemoryStream.cpp 22 Nov 2007 12:20:52 -0000 1.14 +++ WPXMemoryStream.cpp 10 Dec 2008 23:45:49 -0000 1.15 @@ -27,7 +27,7 @@ #include "libwpd_internal.h" -WPXMemoryInputStream::WPXMemoryInputStream(unsigned char *data, size_t size) : +WPXMemoryInputStream::WPXMemoryInputStream(unsigned char *data, unsigned long size) : WPXInputStream(), m_offset(0), m_size(size), @@ -39,7 +39,7 @@ { } -const unsigned char * WPXMemoryInputStream::read(size_t numBytes, size_t &numBytesRead) +const unsigned char * WPXMemoryInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) { numBytesRead = 0; Index: WPXPropertyListVector.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPropertyListVector.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- WPXPropertyListVector.cpp 6 Dec 2008 17:02:25 -0000 1.12 +++ WPXPropertyListVector.cpp 10 Dec 2008 23:45:49 -0000 1.13 @@ -35,9 +35,9 @@ WPXPropertyListVectorImpl(const std::vector<WPXPropertyList> &_vector) : m_vector(_vector) {} WPXPropertyListVectorImpl() : m_vector() {} void append(const WPXPropertyList &elem) { m_vector.push_back(elem); } - size_t count() const { return m_vector.size(); } + unsigned long count() const { return m_vector.size(); } std::vector<WPXPropertyList> m_vector; - const WPXPropertyList &operator[](size_t index) const { return m_vector[index];} + const WPXPropertyList &operator[](unsigned long index) const { return m_vector[index];} }; class WPXPropertyListVectorIterImpl @@ -103,12 +103,12 @@ m_impl->append(i()); } -size_t WPXPropertyListVector::count() const +unsigned long WPXPropertyListVector::count() const { return m_impl->count(); } -const WPXPropertyList& WPXPropertyListVector::operator[](size_t index) const +const WPXPropertyList& WPXPropertyListVector::operator[](unsigned long index) const { return m_impl->operator[](index); } Index: WP1PictureGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP1PictureGroup.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WP1PictureGroup.cpp 19 Nov 2008 13:15:34 -0000 1.2 +++ WP1PictureGroup.cpp 10 Dec 2008 23:45:49 -0000 1.3 @@ -58,7 +58,7 @@ input->seek(-2, WPX_SEEK_CUR); for (int i = 0; i < 512; i++) m_binaryData.append((unsigned char)0); - for (size_t j = 0; j < dataSize && !input->atEOS(); j++ ); + for (unsigned long j = 0; j < dataSize && !input->atEOS(); j++ ); m_binaryData.append(readU8(input, encryption)); #if DUMP_PICTURE std::ostringstream filename; Index: WPXPropertyListVector.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPropertyListVector.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- WPXPropertyListVector.h 6 Dec 2008 17:02:25 -0000 1.11 +++ WPXPropertyListVector.h 10 Dec 2008 23:45:49 -0000 1.12 @@ -26,7 +26,6 @@ #ifndef WPXPROPERTYLISTVECTOR_H #define WPXPROPERTYLISTVECTOR_H -#include <sys/types.h> #include "WPXPropertyList.h" @@ -41,8 +40,8 @@ virtual ~WPXPropertyListVector(); void append(const WPXPropertyList &elem); void append(const WPXPropertyListVector &vec); - size_t count() const; - const WPXPropertyList& operator[](size_t index) const; + unsigned long count() const; + const WPXPropertyList& operator[](unsigned long index) const; WPXPropertyListVector& operator=(const WPXPropertyListVector& vect); class Iter Index: libwpd-stream-0.9.def =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd-stream-0.9.def,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libwpd-stream-0.9.def 18 Nov 2008 02:25:49 -0000 1.1 +++ libwpd-stream-0.9.def 10 Dec 2008 23:45:49 -0000 1.2 @@ -1,6 +1,6 @@ _ZN13WPXFileStream11isOLEStreamEv _ZN13WPXFileStream20getDocumentOLEStreamEPKc -_ZN13WPXFileStream4readEjRj +_ZN13WPXFileStream4readEmRm _ZN13WPXFileStream4seekEl13WPX_SEEK_TYPE _ZN13WPXFileStream4tellEv _ZN13WPXFileStream5atEOSEv @@ -11,7 +11,7 @@ _ZN13WPXFileStreamD2Ev _ZN15WPXStringStream11isOLEStreamEv _ZN15WPXStringStream20getDocumentOLEStreamEPKc -_ZN15WPXStringStream4readEjRj +_ZN15WPXStringStream4readEmRm _ZN15WPXStringStream4seekEl13WPX_SEEK_TYPE _ZN15WPXStringStream4tellEv _ZN15WPXStringStream5atEOSEv Index: WPXEncryption.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXEncryption.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WPXEncryption.cpp 22 Oct 2008 12:17:51 -0000 1.3 +++ WPXEncryption.cpp 10 Dec 2008 23:45:49 -0000 1.4 @@ -28,7 +28,7 @@ #include "libwpd_internal.h" #include <string.h> -WPXEncryption::WPXEncryption(const char *password, const size_t encryptionStartOffset) : +WPXEncryption::WPXEncryption(const char *password, const unsigned long encryptionStartOffset) : m_buffer(NULL), m_password(), m_encryptionStartOffset(encryptionStartOffset), @@ -36,7 +36,7 @@ { if (password) { - for (size_t i = 0; i < strlen(password); i++) + for (unsigned long i = 0; i < strlen(password); i++) if (password[i] >= 'a' && password[i] <= 'z') m_password.append(password[i] - 'a' + 'A'); else @@ -64,25 +64,25 @@ return checkSum; } -const unsigned char * WPXEncryption::readAndDecrypt(WPXInputStream *input, size_t numBytes, size_t &numBytesRead) +const unsigned char * WPXEncryption::readAndDecrypt(WPXInputStream *input, unsigned long numBytes, unsigned long &numBytesRead) { if ((m_password.len() <= 0) || (m_encryptionStartOffset > input->tell() + numBytes)) return input->read(numBytes, numBytesRead); - size_t readStartPosition = input->tell(); - if (readStartPosition == (size_t)-1) + unsigned long readStartPosition = input->tell(); + if (readStartPosition == (unsigned long)-1) return 0; const unsigned char *encryptedBuffer = input->read(numBytes, numBytesRead); if (m_buffer) delete [] m_buffer; m_buffer = new unsigned char[numBytesRead]; - for (size_t i=0; i<numBytesRead; i++) + for (unsigned long i=0; i<numBytesRead; i++) { if (readStartPosition + i < m_encryptionStartOffset) m_buffer[i] = encryptedBuffer[i]; else { - size_t passwordOffset = (readStartPosition + i - m_encryptionStartOffset) % m_password.len(); + unsigned long passwordOffset = (readStartPosition + i - m_encryptionStartOffset) % m_password.len(); unsigned char encryptionMask = (unsigned char)(m_encryptionMaskBase + readStartPosition + i - m_encryptionStartOffset); m_buffer[i] = encryptedBuffer[i] ^ ( m_password.cstr()[passwordOffset] ^ encryptionMask); } Index: libwpd-0.9.def =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd-0.9.def,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- libwpd-0.9.def 25 Nov 2008 11:53:48 -0000 1.3 +++ libwpd-0.9.def 10 Dec 2008 23:45:49 -0000 1.4 @@ -5,13 +5,13 @@ _ZN11WPXPropertyD2Ev _ZN13WPXBinaryData5clearEv _ZN13WPXBinaryData6appendEh -_ZN13WPXBinaryData6appendEPKhj +_ZN13WPXBinaryData6appendEPKhm _ZN13WPXBinaryData6appendERKS_ _ZN13WPXBinaryDataaSERKS_ -_ZN13WPXBinaryDataC1EPKhj +_ZN13WPXBinaryDataC1EPKhm _ZN13WPXBinaryDataC1ERKS_ _ZN13WPXBinaryDataC1Ev -_ZN13WPXBinaryDataC2EPKhj +_ZN13WPXBinaryDataC2EPKhm _ZN13WPXBinaryDataC2ERKS_ _ZN13WPXBinaryDataC2Ev _ZN13WPXBinaryDataD1Ev @@ -27,7 +27,7 @@ _ZN15WPXPropertyList4IterD2Ev _ZN15WPXPropertyList5clearEv _ZN15WPXPropertyList6insertEPKcb -_ZN15WPXPropertyList6insertEPKcf7WPXUnit +_ZN15WPXPropertyList6insertEPKcd7WPXUnit _ZN15WPXPropertyList6insertEPKci _ZN15WPXPropertyList6insertEPKcP11WPXProperty _ZN15WPXPropertyList6insertEPKcRK9WPXString @@ -43,12 +43,12 @@ _ZN15WPXPropertyListD2Ev _ZN18WPXPropertyFactory10newIntPropEi _ZN18WPXPropertyFactory11newBoolPropEb -_ZN18WPXPropertyFactory11newInchPropEf -_ZN18WPXPropertyFactory11newTwipPropEf -_ZN18WPXPropertyFactory12newPointPropEf +_ZN18WPXPropertyFactory11newInchPropEd +_ZN18WPXPropertyFactory11newTwipPropEd +_ZN18WPXPropertyFactory12newPointPropEd _ZN18WPXPropertyFactory13newStringPropEPKc _ZN18WPXPropertyFactory13newStringPropERK9WPXString -_ZN18WPXPropertyFactory14newPercentPropEf +_ZN18WPXPropertyFactory14newPercentPropEd _ZN21WPXPropertyListVector4Iter4lastEv _ZN21WPXPropertyListVector4Iter4nextEv _ZN21WPXPropertyListVector4Iter6rewindEv @@ -59,6 +59,7 @@ _ZN21WPXPropertyListVector4IterD2Ev _ZN21WPXPropertyListVector6appendERK15WPXPropertyList _ZN21WPXPropertyListVector6appendERKS_ +_ZN21WPXPropertyListVectoraSERKS_ _ZN21WPXPropertyListVectorC1ERKS_ _ZN21WPXPropertyListVectorC1Ev _ZN21WPXPropertyListVectorC2ERKS_ @@ -91,8 +92,6 @@ _ZN9WPXStringC2Ev _ZN9WPXStringD1Ev _ZN9WPXStringD2Ev -_ZN9WPXStringeqEPKc -_ZN9WPXStringeqERKS_ _ZNK13WPXBinaryData13getBase64DataEv _ZNK13WPXBinaryData13getDataBufferEv _ZNK13WPXBinaryData13getDataStreamEv @@ -101,10 +100,12 @@ _ZNK15WPXPropertyListixEPKc _ZNK21WPXPropertyListVector4IterclEv _ZNK21WPXPropertyListVector5countEv -_ZNK21WPXPropertyListVectorixEj +_ZNK21WPXPropertyListVectorixEm _ZNK9WPXString3lenEv _ZNK9WPXString4cstrEv _ZNK9WPXString4IterclEv +_ZNK9WPXStringeqEPKc +_ZNK9WPXStringeqERKS_ _ZTI15WPXPropertyList _ZTI21WPXPropertyListVector _ZTIN15WPXPropertyList4IterE Index: WPXStream.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXStream.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- WPXStream.h 22 Nov 2007 12:20:52 -0000 1.13 +++ WPXStream.h 10 Dec 2008 23:45:49 -0000 1.14 @@ -24,7 +24,6 @@ #ifndef WPXSTREAM_H #define WPXSTREAM_H -#include <stdio.h> enum WPX_SEEK_TYPE { @@ -59,7 +58,7 @@ \return Should be a pointer to an array of numBytesRead bytes (unsigned char[numBytesRead]). \return Optionally it could be 0 if the desired number of bytes could not be read. */ - virtual const unsigned char *read(size_t numBytes, size_t &numBytesRead) = 0; + virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) = 0; /** Moves to the next location inside the input stream. \param offset The offset of the location inside the input stream to move to. Index: WPXStreamImplementation.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXStreamImplementation.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- WPXStreamImplementation.cpp 18 Nov 2008 02:25:49 -0000 1.17 +++ WPXStreamImplementation.cpp 10 Dec 2008 23:45:49 -0000 1.18 @@ -115,7 +115,7 @@ #define BUFFER_MAX 65536 -const unsigned char *WPXFileStream::read(size_t numBytes, size_t &numBytesRead) +const unsigned char *WPXFileStream::read(unsigned long numBytes, unsigned long &numBytesRead) { numBytesRead = 0; @@ -309,7 +309,7 @@ delete d; } -const unsigned char *WPXStringStream::read(size_t numBytes, size_t &numBytesRead) +const unsigned char *WPXStringStream::read(unsigned long numBytes, unsigned long &numBytesRead) { numBytesRead = 0; Index: WPXBinaryData.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXBinaryData.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- WPXBinaryData.cpp 19 Nov 2008 13:15:34 -0000 1.10 +++ WPXBinaryData.cpp 10 Dec 2008 23:45:49 -0000 1.11 @@ -56,27 +56,27 @@ m_binaryDataImpl->m_buf = data.m_binaryDataImpl->m_buf; } -WPXBinaryData::WPXBinaryData(const unsigned char *buffer, const size_t bufferSize) : +WPXBinaryData::WPXBinaryData(const unsigned char *buffer, const unsigned long bufferSize) : m_binaryDataImpl(new WPXBinaryDataImpl) { m_binaryDataImpl->m_buf = std::vector<unsigned char> (bufferSize); - for (size_t i = 0; i < bufferSize; i++) + for (unsigned long i = 0; i < bufferSize; i++) m_binaryDataImpl->m_buf[i] = buffer[i]; } void WPXBinaryData::append(const WPXBinaryData &data) { - size_t previousSize = m_binaryDataImpl->m_buf.size(); + unsigned long previousSize = m_binaryDataImpl->m_buf.size(); m_binaryDataImpl->m_buf.reserve(previousSize + data.m_binaryDataImpl->m_buf.size()); - for (size_t i = 0; i < data.m_binaryDataImpl->m_buf.size(); i++) + for (unsigned long i = 0; i < data.m_binaryDataImpl->m_buf.size(); i++) m_binaryDataImpl->m_buf.push_back(data.m_binaryDataImpl->m_buf[i]); } -void WPXBinaryData::append(const unsigned char *buffer, const size_t bufferSize ) +void WPXBinaryData::append(const unsigned char *buffer, const unsigned long bufferSize ) { - size_t previousSize = m_binaryDataImpl->m_buf.size(); + unsigned long previousSize = m_binaryDataImpl->m_buf.size(); m_binaryDataImpl->m_buf.reserve(previousSize + bufferSize); - for (size_t i = 0; i < bufferSize; i++) + for (unsigned long i = 0; i < bufferSize; i++) m_binaryDataImpl->m_buf.push_back(buffer[i]); } @@ -90,9 +90,9 @@ m_binaryDataImpl->m_buf = std::vector<unsigned char>(); } -size_t WPXBinaryData::size() const +unsigned long WPXBinaryData::size() const { - return (size_t)m_binaryDataImpl->m_buf.size(); + return (unsigned long)m_binaryDataImpl->m_buf.size(); } WPXBinaryData& WPXBinaryData::operator=(const WPXBinaryData &dataBuf) Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- libwpd_internal.cpp 3 Dec 2008 13:40:34 -0000 1.43 +++ libwpd_internal.cpp 10 Dec 2008 23:45:49 -0000 1.44 @@ -30,7 +30,7 @@ uint8_t readU8(WPXInputStream *input, WPXEncryption *encryption) { - size_t numBytesRead; + unsigned long numBytesRead; uint8_t const * p = (encryption ? encryption->readAndDecrypt(input, sizeof(uint8_t), numBytesRead) : input->read(sizeof(uint8_t), numBytesRead)); @@ -43,7 +43,7 @@ uint16_t readU16(WPXInputStream *input, WPXEncryption *encryption, bool bigendian) { - size_t numBytesRead; + unsigned long numBytesRead; uint16_t const *val = (uint16_t const *)(encryption ? encryption->readAndDecrypt(input, sizeof(uint16_t), numBytesRead) : input->read(sizeof(uint16_t), numBytesRead)); @@ -58,7 +58,7 @@ uint32_t readU32(WPXInputStream *input, WPXEncryption *encryption, bool bigendian) { - size_t numBytesRead; + unsigned long numBytesRead; uint32_t const *val = (uint32_t const *)(encryption ? encryption->readAndDecrypt(input, sizeof(uint32_t), numBytesRead) : input->read(sizeof(uint32_t), numBytesRead)); Index: WPXBinaryData.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXBinaryData.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WPXBinaryData.h 19 Nov 2008 13:15:34 -0000 1.6 +++ WPXBinaryData.h 10 Dec 2008 23:45:49 -0000 1.7 @@ -26,7 +26,6 @@ #define WPXBINARYDATA_H #include "WPXString.h" -#include <stdio.h> class WPXInputStream; class WPXBinaryDataImpl; @@ -36,15 +35,15 @@ public: WPXBinaryData(); WPXBinaryData(const WPXBinaryData &); - WPXBinaryData(const unsigned char *buffer, const size_t bufferSize); + WPXBinaryData(const unsigned char *buffer, const unsigned long bufferSize); ~WPXBinaryData(); void append(const WPXBinaryData &data); - void append(const unsigned char *buffer, const size_t bufferSize); + void append(const unsigned char *buffer, const unsigned long bufferSize); void append(const unsigned char c); void clear(); - size_t size() const; + unsigned long size() const; const unsigned char *getDataBuffer() const; const WPXString getBase64Data() const; const WPXInputStream *getDataStream() const; Index: WPXMemoryStream.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXMemoryStream.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- WPXMemoryStream.h 7 Nov 2008 17:24:23 -0000 1.12 +++ WPXMemoryStream.h 10 Dec 2008 23:45:49 -0000 1.13 @@ -29,21 +29,21 @@ class WPXMemoryInputStream : public WPXInputStream { public: - WPXMemoryInputStream(unsigned char *data, size_t size); + WPXMemoryInputStream(unsigned char *data, unsigned long size); virtual ~WPXMemoryInputStream(); virtual bool isOLEStream() { return false; } virtual WPXInputStream * getDocumentOLEStream(const char*) { return 0; } - virtual const unsigned char *read(size_t numBytes, size_t &numBytesRead); + virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); virtual int seek(long offset, WPX_SEEK_TYPE seekType); virtual long tell(); virtual bool atEOS(); - virtual size_t getSize() const { return m_size; }; + virtual unsigned long getSize() const { return m_size; }; private: long m_offset; - size_t m_size; + unsigned long m_size; unsigned char *m_data; WPXMemoryInputStream(const WPXMemoryInputStream&); WPXMemoryInputStream& operator=(const WPXMemoryInputStream&); Index: WPXStreamImplementation.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXStreamImplementation.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- WPXStreamImplementation.h 7 Nov 2008 17:24:23 -0000 1.5 +++ WPXStreamImplementation.h 10 Dec 2008 23:45:49 -0000 1.6 @@ -32,7 +32,7 @@ explicit WPXFileStream(const char* filename); ~WPXFileStream(); - const unsigned char *read(size_t numBytes, size_t &numBytesRead); + const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); long tell(); int seek(long offset, WPX_SEEK_TYPE seekType); bool atEOS(); @@ -54,7 +54,7 @@ WPXStringStream(const unsigned char *data, const unsigned int dataSize); ~WPXStringStream(); - const unsigned char *read(size_t numBytes, size_t &numBytesRead); + const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); long tell(); int seek(long offset, WPX_SEEK_TYPE seekType); bool atEOS(); |
|
From: Fridrich S. <str...@us...> - 2008-12-10 23:36:20
|
Update of /cvsroot/libwpd/libwpd2/src/conv/text In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4508/text Modified Files: Makefile.am Log Message: allow building also when builddir is *not* srcdir Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/text/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile.am 11 Oct 2007 14:49:31 -0000 1.18 +++ Makefile.am 10 Dec 2008 23:36:14 -0000 1.19 @@ -6,7 +6,7 @@ bin_PROGRAMS = $(target_wpd2text) -AM_CXXFLAGS = -I$(top_srcdir)/src/lib $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(DEBUG_CXXFLAGS) wpd2text_DEPENDENCIES = @WPD2TEXT_WIN32_RESOURCE@ |
|
From: Fridrich S. <str...@us...> - 2008-12-10 23:36:19
|
Update of /cvsroot/libwpd/libwpd2/src/conv/raw In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4508/raw Modified Files: Makefile.am Log Message: allow building also when builddir is *not* srcdir Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/raw/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile.am 11 Oct 2007 14:49:30 -0000 1.15 +++ Makefile.am 10 Dec 2008 23:36:14 -0000 1.16 @@ -6,7 +6,7 @@ bin_PROGRAMS = $(target_wpd2raw) -AM_CXXFLAGS = -I$(top_srcdir)/src/lib $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(DEBUG_CXXFLAGS) wpd2raw_DEPENDENCIES = @WPD2RAW_WIN32_RESOURCE@ |
|
From: Fridrich S. <str...@us...> - 2008-12-10 23:36:19
|
Update of /cvsroot/libwpd/libwpd2/src/conv/html In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4508/html Modified Files: Makefile.am Log Message: allow building also when builddir is *not* srcdir Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile.am 11 Oct 2007 14:49:30 -0000 1.17 +++ Makefile.am 10 Dec 2008 23:36:14 -0000 1.18 @@ -6,7 +6,7 @@ bin_PROGRAMS = $(target_wpd2html) -AM_CXXFLAGS = -I$(top_srcdir)/src/lib $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(DEBUG_CXXFLAGS) wpd2html_DEPENDENCIES = @WPD2HTML_WIN32_RESOURCE@ |
|
From: Fridrich S. <str...@us...> - 2008-12-10 12:59:20
|
Update of /cvsroot/libwpd/writerperfect/filter In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16758/filter Modified Files: OdgExporter.cxx Log Message: move gradient angle from WPGGradient class to the general style (we will get rid of WPGGradient soon) Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- OdgExporter.cxx 5 Dec 2008 15:17:45 -0000 1.32 +++ OdgExporter.cxx 10 Dec 2008 12:59:04 -0000 1.33 @@ -532,7 +532,7 @@ pDrawGradientElement->addAttribute("draw:name", sValue); // ODG angle unit is 0.1 degree - double angle = -mxGradient.angle(); + double angle = mxStyle["draw:angle"] ? -mxStyle["draw:angle"]->getDouble() : 0.0; while(angle < 0) angle += 360; while(angle > 360) |
|
From: Fridrich S. <str...@us...> - 2008-12-06 17:02:35
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3996/src/lib Modified Files: WPXPropertyListVector.cpp WPXPropertyListVector.h Log Message: make the operator= in WPXPropertyListVector return reference instead of const reference + remove obsolete stuff Index: WPXPropertyListVector.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPropertyListVector.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- WPXPropertyListVector.cpp 3 Dec 2008 05:28:07 -0000 1.11 +++ WPXPropertyListVector.cpp 6 Dec 2008 17:02:25 -0000 1.12 @@ -113,11 +113,11 @@ return m_impl->operator[](index); } -const WPXPropertyListVector& WPXPropertyListVector::operator=(const WPXPropertyListVector &vec) +WPXPropertyListVector& WPXPropertyListVector::operator=(const WPXPropertyListVector &vect) { - m_impl->m_vector = vec.m_impl->m_vector; + m_impl->m_vector = vect.m_impl->m_vector; return *this; -} +} WPXPropertyListVector::Iter::Iter(const WPXPropertyListVector &vect) : m_iterImpl(new WPXPropertyListVectorIterImpl(&(static_cast<WPXPropertyListVectorImpl* >(vect.m_impl)->m_vector))) Index: WPXPropertyListVector.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPropertyListVector.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- WPXPropertyListVector.h 3 Dec 2008 05:28:07 -0000 1.10 +++ WPXPropertyListVector.h 6 Dec 2008 17:02:25 -0000 1.11 @@ -28,15 +28,11 @@ #define WPXPROPERTYLISTVECTOR_H #include <sys/types.h> -class WPXPropertyList; +#include "WPXPropertyList.h" class WPXPropertyListVectorImpl; class WPXPropertyListVectorIterImpl; -// NOTE: this class is meant to be used in libwpd's headers (to work around symbol problems -// when different versions of the STL are in use), and should not be used inside your application -// (it will only slow it down with a pointless layer of abstraction) - class WPXPropertyListVector { public: @@ -47,7 +43,7 @@ void append(const WPXPropertyListVector &vec); size_t count() const; const WPXPropertyList& operator[](size_t index) const; - const WPXPropertyListVector& operator=(const WPXPropertyListVector&); + WPXPropertyListVector& operator=(const WPXPropertyListVector& vect); class Iter { |
1 message has been excluded from this view by a project administrator.
