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...> - 2008-11-25 12:04:02
|
Update of /cvsroot/libwpd/writerperfect/filter In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29387/filter Modified Files: OdgExporter.cxx OdgExporter.hxx Log Message: addapting to the new drawPolyline, drawPolygon and drawPath callbacks Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- OdgExporter.cxx 24 Nov 2008 10:17:05 -0000 1.20 +++ OdgExporter.cxx 25 Nov 2008 12:03:57 -0000 1.21 @@ -75,13 +75,13 @@ } } -void OdgExporter::startGraphics(double width, double height) +void OdgExporter::startGraphics(const ::WPXPropertyList &propList) { miGradientIndex = 1; miDashIndex = 1; miGraphicsStyleIndex = 1; - mfWidth = width; - mfHeight = height; + mfWidth = 0.0; + mfHeight = 0.0; mpHandler->startDocument(); TagOpenElement tmpOfficeDocumentContent("office:document"); @@ -122,14 +122,18 @@ configItemOpenElement.addAttribute("config:name", "VisibleAreaWidth"); configItemOpenElement.addAttribute("config:type", "int"); configItemOpenElement.write(mpHandler); - WPXString sWidth; sWidth.sprintf("%li", (unsigned long)(2540 * width)); + if (propList["svg:width"]) + mfWidth = propList["svg:width"]->getFloat(); + WPXString sWidth; sWidth.sprintf("%li", (unsigned long)(2540 * mfWidth)); mpHandler->characters(sWidth); mpHandler->endElement("config:config-item"); configItemOpenElement.addAttribute("config:name", "VisibleAreaHeight"); configItemOpenElement.addAttribute("config:type", "int"); configItemOpenElement.write(mpHandler); - WPXString sHeight; sHeight.sprintf("%li", (unsigned long)(2540 * height)); + if (propList["svg:height"]) + mfHeight = propList["svg:height"]->getFloat(); + WPXString sHeight; sHeight.sprintf("%li", (unsigned long)(2540 * mfHeight)); mpHandler->characters(sHeight); mpHandler->endElement("config:config-item"); @@ -319,26 +323,23 @@ mBodyElements.push_back(new TagCloseElement("draw:ellipse")); } -void OdgExporter::drawPolyline(const libwpg::WPGPointArray& vertices) +void OdgExporter::drawPolyline(const ::WPXPropertyListVector& vertices) { drawPolySomething(vertices, false); } -void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) +void OdgExporter::drawPolygon(const ::WPXPropertyListVector& vertices) { drawPolySomething(vertices, true); } -void OdgExporter::drawPolySomething(const libwpg::WPGPointArray& vertices, bool isClosed) +void OdgExporter::drawPolySomething(const ::WPXPropertyListVector& vertices, bool isClosed) { if(vertices.count() < 2) return; if(vertices.count() == 2) { - const libwpg::WPGPoint& p1 = vertices[0]; - const libwpg::WPGPoint& p2 = vertices[1]; - writeGraphicsStyle(); TagOpenElement *pDrawLineElement = new TagOpenElement("draw:line"); WPXString sValue; @@ -346,30 +347,38 @@ pDrawLineElement->addAttribute("draw:style-name", sValue); pDrawLineElement->addAttribute("draw:text-style-name", "P1"); pDrawLineElement->addAttribute("draw:layer", "layout"); - sValue = doubleToString(p1.x); sValue.append("in"); - pDrawLineElement->addAttribute("svg:x1", sValue); - sValue = doubleToString(p1.y); sValue.append("in"); - pDrawLineElement->addAttribute("svg:y1", sValue); - sValue = doubleToString(p2.x); sValue.append("in"); - pDrawLineElement->addAttribute("svg:x2", sValue); - sValue = doubleToString(p2.y); sValue.append("in"); - pDrawLineElement->addAttribute("svg:y2", sValue); + pDrawLineElement->addAttribute("svg:x1", vertices[0]["svg:x"]->getStr()); + pDrawLineElement->addAttribute("svg:y1", vertices[0]["svg:y"]->getStr()); + pDrawLineElement->addAttribute("svg:x2", vertices[1]["svg:x"]->getStr()); + pDrawLineElement->addAttribute("svg:y2", vertices[1]["svg:y"]->getStr()); mBodyElements.push_back(pDrawLineElement); mBodyElements.push_back(new TagCloseElement("draw:line")); } else { - // draw as path - libwpg::WPGPath path; - path.moveTo(vertices[0]); - for(unsigned long ii = 1; ii < vertices.count(); ii++) - path.lineTo(vertices[ii]); - path.closed = isClosed; + ::WPXPropertyListVector path; + ::WPXPropertyList element; + + for (unsigned long ii = 0; ii < vertices.count(); ii++) + { + element = vertices[ii]; + if (ii == 0) + element.insert("libwpg:path-action", "M"); + else + element.insert("libwpg:path-action", "L"); + path.append(element); + element.clear(); + } + if (isClosed) + { + element.insert("libwpg:path-action", "Z"); + path.append(element); + } drawPath(path); } } -void OdgExporter::drawPath(const libwpg::WPGPath& path) +void OdgExporter::drawPath(const WPXPropertyListVector& path) { if(path.count() == 0) return; @@ -377,29 +386,32 @@ // try to find the bounding box // this is simple convex hull technique, the bounding box might not be // accurate but that should be enough for this purpose - libwpg::WPGPoint p = path.element(0).point; - libwpg::WPGPoint q = path.element(0).point; + double px = path[0]["svg:x"]->getFloat(); + double py = path[0]["svg:y"]->getFloat(); + double qx = path[0]["svg:x"]->getFloat(); + double qy = path[0]["svg:y"]->getFloat(); for(unsigned k = 0; k < path.count(); k++) { - libwpg::WPGPathElement element = path.element(k); - p.x = (p.x > element.point.x) ? element.point.x : p.x; - p.y = (p.y > element.point.y) ? element.point.y : p.y; - q.x = (q.x < element.point.x) ? element.point.x : q.x; - q.y = (q.y < element.point.y) ? element.point.y : q.y; - if(element.type == libwpg::WPGPathElement::CurveToElement) + if (!path[k]["svg:x"] || !path[k]["svg:y"]) + continue; + px = (px > path[k]["svg:x"]->getFloat()) ? path[k]["svg:x"]->getFloat() : px; + py = (py > path[k]["svg:y"]->getFloat()) ? path[k]["svg:y"]->getFloat() : py; + qx = (qx < path[k]["svg:x"]->getFloat()) ? path[k]["svg:x"]->getFloat() : qx; + qy = (qy < path[k]["svg:y"]->getFloat()) ? path[k]["svg:y"]->getFloat() : qy; + if(path[k]["libwpg:path-action"]->getStr() == "C") { - p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; - p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; - q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; - q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; - p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; - p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; - q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; - q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; + px = (px > path[k]["svg:x1"]->getFloat()) ? path[k]["svg:x1"]->getFloat() : px; + py = (py > path[k]["svg:y1"]->getFloat()) ? path[k]["svg:y1"]->getFloat() : py; + qx = (qx < path[k]["svg:x1"]->getFloat()) ? path[k]["svg:x1"]->getFloat() : qx; + qy = (qy < path[k]["svg:y1"]->getFloat()) ? path[k]["svg:y1"]->getFloat() : qy; + px = (px > path[k]["svg:x2"]->getFloat()) ? path[k]["svg:x2"]->getFloat() : px; + py = (py > path[k]["svg:y2"]->getFloat()) ? path[k]["svg:y2"]->getFloat() : py; + qx = (qx < path[k]["svg:x2"]->getFloat()) ? path[k]["svg:x2"]->getFloat() : qx; + qy = (qy < path[k]["svg:y2"]->getFloat()) ? path[k]["svg:y2"]->getFloat() : qy; } } - double vw = q.x - p.x; - double vh = q.y - p.y; + double vw = qx - px; + double vh = qy - py; writeGraphicsStyle(); @@ -409,9 +421,9 @@ pDrawPathElement->addAttribute("draw:style-name", sValue); pDrawPathElement->addAttribute("draw:text-style-name", "P1"); pDrawPathElement->addAttribute("draw:layer", "layout"); - sValue = doubleToString(p.x); sValue.append("in"); + sValue = doubleToString(px); sValue.append("in"); pDrawPathElement->addAttribute("svg:x", sValue); - sValue = doubleToString(p.y); sValue.append("in"); + sValue = doubleToString(py); sValue.append("in"); pDrawPathElement->addAttribute("svg:y", sValue); sValue = doubleToString(vw); sValue.append("in"); pDrawPathElement->addAttribute("svg:width", sValue); @@ -423,33 +435,28 @@ sValue.clear(); for(unsigned i = 0; i < path.count(); i++) { - libwpg::WPGPathElement element = path.element(i); - libwpg::WPGPoint point = element.point; WPXString sElement; - switch(element.type) + if (path[i]["libwpg:path-action"]->getStr() == "M") { // 2540 is 2.54*1000, 2.54 in = 1 inch - case libwpg::WPGPathElement::MoveToElement: - sElement.sprintf("M%i %i", (unsigned)((point.x-p.x)*2540), (unsigned)((point.y-p.y)*2540)); - break; - - case libwpg::WPGPathElement::LineToElement: - sElement.sprintf("L%i %i", (unsigned)((point.x-p.x)*2540), (unsigned)((point.y-p.y)*2540)); - break; - - case libwpg::WPGPathElement::CurveToElement: - sElement.sprintf("C%i %i %i %i %i %i", (unsigned)((element.extra1.x-p.x)*2540), - (int)((element.extra1.y-p.y)*2540), (unsigned)((element.extra2.x-p.x)*2540), - (int)((element.extra2.y-p.y)*2540), (unsigned)((point.x-p.x)*2540), (unsigned)((point.y-p.y)*2540)); - break; - - default: - break; + sElement.sprintf("M%i %i", (unsigned)((path[i]["svg:x"]->getFloat()-px)*2540), (unsigned)((path[i]["svg:y"]->getFloat()-py)*2540)); + sValue.append(sElement); } - sValue.append(sElement); + else if (path[i]["libwpg:path-action"]->getStr() == "L") + { + sElement.sprintf("L%i %i", (unsigned)((path[i]["svg:x"]->getFloat()-px)*2540), (unsigned)((path[i]["svg:y"]->getFloat()-py)*2540)); + sValue.append(sElement); + } + else if (path[i]["libwpg:path-action"]->getStr() == "C") + { + sElement.sprintf("C%i %i %i %i %i %i", (unsigned)((path[i]["svg:x1"]->getFloat()-px)*2540), + (int)((path[i]["svg:y1"]->getFloat()-py)*2540), (unsigned)((path[i]["svg:x2"]->getFloat()-px)*2540), + (int)((path[i]["svg:y2"]->getFloat()-py)*2540), (unsigned)((path[i]["svg:x"]->getFloat()-px)*2540), (unsigned)((path[i]["svg:y"]->getFloat()-py)*2540)); + sValue.append(sElement); + } + else if (path[i]["libwpg:path-action"]->getStr() == "Z" && i == (path.count() - 1)) + sValue.append(" Z"); } - if(path.closed) - sValue.append(" Z"); pDrawPathElement->addAttribute("svg:d", sValue); mBodyElements.push_back(pDrawPathElement); mBodyElements.push_back(new TagCloseElement("draw:path")); Index: OdgExporter.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.hxx,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- OdgExporter.hxx 24 Nov 2008 10:17:05 -0000 1.7 +++ OdgExporter.hxx 25 Nov 2008 12:03:57 -0000 1.8 @@ -40,11 +40,11 @@ OdgExporter(DocumentHandler *pHandler, const bool isFlatXML = false); ~OdgExporter(); - void startGraphics(double width, double height); + void startGraphics(const ::WPXPropertyList &propList); void endGraphics(); void startLayer(unsigned int id); void endLayer(unsigned int id); - void startEmbeddedGraphics(double /* width */, double /* height */) {} + void startEmbeddedGraphics(const ::WPXPropertyList& /*propList*/) {} void endEmbeddedGraphics() {} void setPen(const libwpg::WPGPen& pen); @@ -53,16 +53,16 @@ void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry, double rotation, const libwpg::WPGPoint& from, const libwpg::WPGPoint& to); - void drawPolyline(const libwpg::WPGPointArray& vertices); - void drawPolygon(const libwpg::WPGPointArray& vertices); - void drawPath(const libwpg::WPGPath& path); + void drawPolyline(const ::WPXPropertyListVector& vertices); + void drawPolygon(const ::WPXPropertyListVector& vertices); + void drawPath(const ::WPXPropertyListVector& path); void drawBitmap(const libwpg::WPGBitmap& bitmap); void drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData); private: void writeGraphicsStyle(); WPXString doubleToString(const double value); - void drawPolySomething(const libwpg::WPGPointArray& vertices, bool isClosed); + void drawPolySomething(const ::WPXPropertyListVector& vertices, bool isClosed); // body elements std::vector <DocumentElement *> mBodyElements; |
|
From: Fridrich S. <str...@us...> - 2008-11-25 11:54:00
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28662/src/lib Modified Files: WPXPropertyListVector.cpp WPXPropertyListVector.h libwpd-0.9.def Log Message: extend WPXPropertyListVector API allowing to append an WPXPropertyListVector Index: libwpd-0.9.def =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd-0.9.def,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libwpd-0.9.def 19 Nov 2008 09:30:52 -0000 1.2 +++ libwpd-0.9.def 25 Nov 2008 11:53:48 -0000 1.3 @@ -4,9 +4,10 @@ _ZN10WPDocument5parseEP14WPXInputStreamP20WPXDocumentInterfacePKc _ZN11WPXPropertyD2Ev _ZN13WPXBinaryData5clearEv +_ZN13WPXBinaryData6appendEh _ZN13WPXBinaryData6appendEPKhj _ZN13WPXBinaryData6appendERKS_ -_ZN13WPXBinaryData6appendEh +_ZN13WPXBinaryDataaSERKS_ _ZN13WPXBinaryDataC1EPKhj _ZN13WPXBinaryDataC1ERKS_ _ZN13WPXBinaryDataC1Ev @@ -15,7 +16,6 @@ _ZN13WPXBinaryDataC2Ev _ZN13WPXBinaryDataD1Ev _ZN13WPXBinaryDataD2Ev -_ZN13WPXBinaryDataaSERKS_ _ZN15WPXPropertyList4Iter3keyEv _ZN15WPXPropertyList4Iter4lastEv _ZN15WPXPropertyList4Iter4nextEv @@ -26,13 +26,14 @@ _ZN15WPXPropertyList4IterD1Ev _ZN15WPXPropertyList4IterD2Ev _ZN15WPXPropertyList5clearEv -_ZN15WPXPropertyList6insertEPKcP11WPXProperty -_ZN15WPXPropertyList6insertEPKcRK9WPXString -_ZN15WPXPropertyList6insertEPKcS1_ _ZN15WPXPropertyList6insertEPKcb _ZN15WPXPropertyList6insertEPKcf7WPXUnit _ZN15WPXPropertyList6insertEPKci +_ZN15WPXPropertyList6insertEPKcP11WPXProperty +_ZN15WPXPropertyList6insertEPKcRK9WPXString +_ZN15WPXPropertyList6insertEPKcS1_ _ZN15WPXPropertyList6removeEPKc +_ZN15WPXPropertyListaSERKS_ _ZN15WPXPropertyListC1ERKS_ _ZN15WPXPropertyListC1Ev _ZN15WPXPropertyListC2ERKS_ @@ -40,7 +41,6 @@ _ZN15WPXPropertyListD0Ev _ZN15WPXPropertyListD1Ev _ZN15WPXPropertyListD2Ev -_ZN15WPXPropertyListaSERKS_ _ZN18WPXPropertyFactory10newIntPropEi _ZN18WPXPropertyFactory11newBoolPropEb _ZN18WPXPropertyFactory11newInchPropEf @@ -58,6 +58,7 @@ _ZN21WPXPropertyListVector4IterD1Ev _ZN21WPXPropertyListVector4IterD2Ev _ZN21WPXPropertyListVector6appendERK15WPXPropertyList +_ZN21WPXPropertyListVector6appendERKS_ _ZN21WPXPropertyListVectorC1ERKS_ _ZN21WPXPropertyListVectorC1Ev _ZN21WPXPropertyListVectorC2ERKS_ @@ -74,10 +75,12 @@ _ZN9WPXString4IterD1Ev _ZN9WPXString4IterD2Ev _ZN9WPXString5clearEv +_ZN9WPXString6appendEc _ZN9WPXString6appendEPKc _ZN9WPXString6appendERKS_ -_ZN9WPXString6appendEc _ZN9WPXString7sprintfEPKcz +_ZN9WPXStringaSEPKc +_ZN9WPXStringaSERKS_ _ZN9WPXStringC1EPKc _ZN9WPXStringC1ERKS_ _ZN9WPXStringC1ERKS_b @@ -88,8 +91,6 @@ _ZN9WPXStringC2Ev _ZN9WPXStringD1Ev _ZN9WPXStringD2Ev -_ZN9WPXStringaSEPKc -_ZN9WPXStringaSERKS_ _ZN9WPXStringeqEPKc _ZN9WPXStringeqERKS_ _ZNK13WPXBinaryData13getBase64DataEv @@ -100,22 +101,23 @@ _ZNK15WPXPropertyListixEPKc _ZNK21WPXPropertyListVector4IterclEv _ZNK21WPXPropertyListVector5countEv +_ZNK21WPXPropertyListVectorixEj _ZNK9WPXString3lenEv -_ZNK9WPXString4IterclEv _ZNK9WPXString4cstrEv -_ZTI15WPXPropertyList DATA -_ZTI21WPXPropertyListVector DATA -_ZTIN15WPXPropertyList4IterE DATA -_ZTIN21WPXPropertyListVector4IterE DATA -_ZTIN9WPXString4IterE DATA -_ZTS15WPXPropertyList DATA -_ZTS21WPXPropertyListVector DATA -_ZTSN15WPXPropertyList4IterE DATA -_ZTSN21WPXPropertyListVector4IterE DATA -_ZTSN9WPXString4IterE DATA +_ZNK9WPXString4IterclEv +_ZTI15WPXPropertyList +_ZTI21WPXPropertyListVector +_ZTIN15WPXPropertyList4IterE +_ZTIN21WPXPropertyListVector4IterE +_ZTIN9WPXString4IterE +_ZTS15WPXPropertyList +_ZTS21WPXPropertyListVector +_ZTSN15WPXPropertyList4IterE +_ZTSN21WPXPropertyListVector4IterE +_ZTSN9WPXString4IterE _ZTV11WPXProperty -_ZTV15WPXPropertyList DATA -_ZTV21WPXPropertyListVector DATA -_ZTVN15WPXPropertyList4IterE DATA -_ZTVN21WPXPropertyListVector4IterE DATA -_ZTVN9WPXString4IterE DATA +_ZTV15WPXPropertyList +_ZTV21WPXPropertyListVector +_ZTVN15WPXPropertyList4IterE +_ZTVN21WPXPropertyListVector4IterE +_ZTVN9WPXString4IterE Index: WPXPropertyListVector.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPropertyListVector.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- WPXPropertyListVector.h 3 Dec 2006 14:52:35 -0000 1.8 +++ WPXPropertyListVector.h 25 Nov 2008 11:53:48 -0000 1.9 @@ -41,27 +41,30 @@ { public: WPXPropertyListVector(const WPXPropertyListVector &); - WPXPropertyListVector(); + WPXPropertyListVector(); virtual ~WPXPropertyListVector(); - virtual void append(const WPXPropertyList &elem); - virtual size_t count() const; + void append(const WPXPropertyList &elem); + void append(const WPXPropertyListVector &vec); + size_t count() const; + const WPXPropertyList& operator[](size_t index) const; - class Iter - { - public: - Iter(const WPXPropertyListVector &vect); - virtual ~Iter(); - void rewind(); + class Iter + { + public: + Iter(const WPXPropertyListVector &vect); + virtual ~Iter(); + void rewind(); bool next(); bool last(); - const WPXPropertyList & operator()() const; + const WPXPropertyList & operator()() const; - private: - WPXPropertyListVectorIterImpl *m_iterImpl; + private: + WPXPropertyListVectorIterImpl *m_iterImpl; Iter(const Iter&); Iter& operator=(const Iter&); - }; - friend class WPXPropertyListVector::Iter; + }; + + friend class WPXPropertyListVector::Iter; private: WPXPropertyListVectorImpl *m_impl; Index: WPXPropertyListVector.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPropertyListVector.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- WPXPropertyListVector.cpp 9 May 2007 12:45:35 -0000 1.9 +++ WPXPropertyListVector.cpp 25 Nov 2008 11:53:48 -0000 1.10 @@ -37,41 +37,42 @@ void append(const WPXPropertyList &elem) { m_vector.push_back(elem); } size_t count() const { return m_vector.size(); } std::vector<WPXPropertyList> m_vector; + const WPXPropertyList &operator[](size_t index) const { return m_vector[index];} }; class WPXPropertyListVectorIterImpl { public: - WPXPropertyListVectorIterImpl(std::vector<WPXPropertyList> * vect) : - m_vector(vect), - m_iter(m_vector->begin()), - m_imaginaryFirst(false) {} + WPXPropertyListVectorIterImpl(std::vector<WPXPropertyList> * vect) : + m_vector(vect), + m_iter(m_vector->begin()), + m_imaginaryFirst(false) {} ~WPXPropertyListVectorIterImpl() {} void rewind() { - m_iter = m_vector->begin(); - m_imaginaryFirst = true; - } + m_iter = m_vector->begin(); + m_imaginaryFirst = true; + } bool next() { - if (!m_imaginaryFirst && m_iter != m_vector->end()) - m_iter++; - m_imaginaryFirst = false; - if (m_iter != m_vector->end()) + if (!m_imaginaryFirst && m_iter != m_vector->end()) + m_iter++; + m_imaginaryFirst = false; + if (m_iter != m_vector->end()) return true; - return false; - } + return false; + } bool last() { - if (m_iter == m_vector->end()) - return true; - return false; - } + if (m_iter == m_vector->end()) + return true; + return false; + } const WPXPropertyList & operator()() const { return (*m_iter); } private: WPXPropertyListVectorIterImpl(const WPXPropertyListVectorIterImpl&); WPXPropertyListVectorIterImpl& operator=(const WPXPropertyListVectorIterImpl&); - std::vector<WPXPropertyList> * m_vector; - std::vector<WPXPropertyList>::iterator m_iter; - bool m_imaginaryFirst; + std::vector<WPXPropertyList> * m_vector; + std::vector<WPXPropertyList>::iterator m_iter; + bool m_imaginaryFirst; }; WPXPropertyListVector::WPXPropertyListVector(const WPXPropertyListVector &vect) : @@ -92,14 +93,26 @@ void WPXPropertyListVector::append(const WPXPropertyList &elem) { - m_impl->append(elem); + m_impl->append(elem); +} + +void WPXPropertyListVector::append(const WPXPropertyListVector &vec) +{ + WPXPropertyListVector::Iter i(vec); + for (i.rewind(); i.next(); ) + m_impl->append(i()); } size_t WPXPropertyListVector::count() const { - return m_impl->count(); + return m_impl->count(); } +const WPXPropertyList& WPXPropertyListVector::operator[](size_t index) const +{ + return m_impl->operator[](index); +} + WPXPropertyListVector::Iter::Iter(const WPXPropertyListVector &vect) : m_iterImpl(new WPXPropertyListVectorIterImpl(&(static_cast<WPXPropertyListVectorImpl* >(vect.m_impl)->m_vector))) { @@ -112,20 +125,20 @@ void WPXPropertyListVector::Iter::rewind() { - m_iterImpl->rewind(); + m_iterImpl->rewind(); } bool WPXPropertyListVector::Iter::next() { - return m_iterImpl->next(); + return m_iterImpl->next(); } bool WPXPropertyListVector::Iter::last() { - return m_iterImpl->last(); + return m_iterImpl->last(); } const WPXPropertyList & WPXPropertyListVector::Iter::operator()() const { - return (*m_iterImpl)(); + return (*m_iterImpl)(); } |
|
From: Fridrich S. <str...@us...> - 2008-11-24 10:17:09
|
Update of /cvsroot/libwpd/writerperfect/filter In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12436/filter Modified Files: OdgExporter.cxx OdgExporter.hxx Log Message: addaptation of writerperfect to the first step in the struggle to simplify libwpg api Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- OdgExporter.cxx 17 Jul 2008 11:42:12 -0000 1.19 +++ OdgExporter.cxx 24 Nov 2008 10:17:05 -0000 1.20 @@ -473,7 +473,7 @@ mBodyElements.push_back(new TagOpenElement("office:binary-data")); - libwpg::WPGString base64Binary; + ::WPXString base64Binary; bitmap.generateBase64DIB(base64Binary); mBodyElements.push_back(new CharDataElement(base64Binary.cstr())); @@ -484,27 +484,29 @@ mBodyElements.push_back(new TagCloseElement("draw:frame")); } -void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) +void OdgExporter::drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData) { - if (binaryData.mimeType.length() <= 0) + if (!propList["libwpg:mime-type"] && propList["libwpg:mime-type"]->getStr().len() <= 0) return; TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame"); + + WPXString sValue; - sValue = doubleToString(binaryData.rect.x1); sValue.append("in"); - pDrawFrameElement->addAttribute("svg:x", sValue); - sValue = doubleToString(binaryData.rect.y1); sValue.append("in"); - pDrawFrameElement->addAttribute("svg:y", sValue); - sValue = doubleToString(binaryData.rect.height()); sValue.append("in"); - pDrawFrameElement->addAttribute("svg:height", sValue); - sValue = doubleToString(binaryData.rect.width()); sValue.append("in"); - pDrawFrameElement->addAttribute("svg:width", sValue); + if (propList["svg:x"]) + pDrawFrameElement->addAttribute("svg:x", propList["svg:x"]->getStr()); + if (propList["svg:y"]) + pDrawFrameElement->addAttribute("svg:y", propList["svg:y"]->getStr()); + if (propList["svg:height"]) + pDrawFrameElement->addAttribute("svg:height", propList["svg:height"]->getStr()); + if (propList["svg:width"]) + pDrawFrameElement->addAttribute("svg:width", propList["svg:width"]->getStr()); mBodyElements.push_back(pDrawFrameElement); mBodyElements.push_back(new TagOpenElement("draw:image")); mBodyElements.push_back(new TagOpenElement("office:binary-data")); - libwpg::WPGString base64Binary = binaryData.getBase64Data(); + ::WPXString base64Binary = binaryData.getBase64Data(); mBodyElements.push_back(new CharDataElement(base64Binary.cstr())); mBodyElements.push_back(new TagCloseElement("office:binary-data")); Index: OdgExporter.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.hxx,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- OdgExporter.hxx 16 Jul 2008 14:12:10 -0000 1.6 +++ OdgExporter.hxx 24 Nov 2008 10:17:05 -0000 1.7 @@ -30,7 +30,7 @@ #include <sstream> #include <string> -#include <libwpd/WPXString.h> +#include <libwpd/libwpd.h> #include <libwpg/libwpg.h> #include "DocumentElement.hxx" #include "DocumentHandler.hxx" @@ -57,7 +57,7 @@ void drawPolygon(const libwpg::WPGPointArray& vertices); void drawPath(const libwpg::WPGPath& path); void drawBitmap(const libwpg::WPGBitmap& bitmap); - void drawImageObject(const libwpg::WPGBinaryData& binaryData); + void drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData); private: void writeGraphicsStyle(); |
|
From: Fridrich S. <str...@us...> - 2008-11-23 17:16:12
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp/examples In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15973/src/csharp/examples Removed Files: wp_test_document.wpd Log Message: check for wpd2raw during configure so that one is warned that checks might fail + package the test wpd file and don't duplicate it in two different directories --- wp_test_document.wpd DELETED --- |
|
From: Fridrich S. <str...@us...> - 2008-11-23 17:16:11
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15973/src/java Modified Files: test.sh.in Log Message: check for wpd2raw during configure so that one is warned that checks might fail + package the test wpd file and don't duplicate it in two different directories Index: test.sh.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/test.sh.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- test.sh.in 20 Nov 2008 16:34:17 -0000 1.6 +++ test.sh.in 23 Nov 2008 17:15:59 -0000 1.7 @@ -1,5 +1,5 @@ tmp=`mktemp -d` -wpd2raw @top_srcdir@/src/java/examples/wp_test_document.wpd >$tmp/cpp.out +@WPD2RAW@ @top_srcdir@/src/java/examples/wp_test_document.wpd >$tmp/cpp.out PATH="$PATH:./.libs" 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 diff -uw $tmp/cpp.out $tmp/java.out |
|
From: Fridrich S. <str...@us...> - 2008-11-23 17:16:11
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15973 Modified Files: configure.in Log Message: check for wpd2raw during configure so that one is warned that checks might fail + package the test wpd file and don't duplicate it in two different directories Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/configure.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- configure.in 21 Nov 2008 10:13:24 -0000 1.19 +++ configure.in 23 Nov 2008 17:15:59 -0000 1.20 @@ -48,7 +48,7 @@ AC_PROG_EGREP -AC_PATH_PROG(SWIG, swig) +test x$SWIG = x && AC_PATH_PROG(SWIG, swig) if test -z "$SWIG"; then AC_MSG_ERROR([*** Could not find swig in your PATH. The libwpd bindings cannot be built.]) fi @@ -115,6 +115,13 @@ AC_SUBST(WPDJAVA_WIN32_RESOURCE) AC_SUBST(WPDSHARP_WIN32_RESOURCE) +test x$WPD2RAW = x && AC_PATH_PROG(WPD2RAW, wpd2raw) +if test x$WPD2RAW = x ; then + AC_MSG_WARN([*** Could not find wpd2raw in your PATH.]) + AC_MSG_WARN([*** The tests will not be built and run.]) +fi +AC_SUBST(WPD2RAW) + AC_MSG_CHECKING([for Win32 platform in general]) case "$host" in *-*-mingw*|*-*-cygwin*) |
|
From: Fridrich S. <str...@us...> - 2008-11-23 17:16:05
|
Update of /cvsroot/libwpd/libwpd2-bindings/m4 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15973/m4 Modified Files: ac_prog_javac.m4 Log Message: check for wpd2raw during configure so that one is warned that checks might fail + package the test wpd file and don't duplicate it in two different directories Index: ac_prog_javac.m4 =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/m4/ac_prog_javac.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ac_prog_javac.m4 21 Nov 2008 10:13:25 -0000 1.4 +++ ac_prog_javac.m4 23 Nov 2008 17:15:59 -0000 1.5 @@ -77,7 +77,6 @@ test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX) test "x$JAVAC" = x && AC_CHECK_TOOL(JAVAC, gcj, $JAVAPREFIX) fi -AC_PROG_EGREP echo "$JAVAC" |$EGREP -q javac && JAVAC="$JAVAC -source 5" echo "$JAVAC" |$EGREP -q gcj && JAVAC="$JAVAC -C" test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) |
|
From: Fridrich S. <str...@us...> - 2008-11-23 17:16:05
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java/examples In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15973/src/java/examples Modified Files: Makefile.am Log Message: check for wpd2raw during configure so that one is warned that checks might fail + package the test wpd file and don't duplicate it in two different directories Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/examples/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 20 Nov 2008 16:34:17 -0000 1.8 +++ Makefile.am 23 Nov 2008 17:15:59 -0000 1.9 @@ -1,4 +1,4 @@ -EXTRA_DIST = wpd2raw.java RawListenerImpl.java +EXTRA_DIST = wpd2raw.java RawListenerImpl.java wp_test_document.wpd all: |
|
From: Fridrich S. <str...@us...> - 2008-11-23 17:16:05
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15973/src/csharp Modified Files: test.sh.in Log Message: check for wpd2raw during configure so that one is warned that checks might fail + package the test wpd file and don't duplicate it in two different directories Index: test.sh.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/test.sh.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- test.sh.in 14 Nov 2008 23:17:58 -0000 1.6 +++ test.sh.in 23 Nov 2008 17:15:59 -0000 1.7 @@ -1,6 +1,6 @@ tmp=`mktemp -d` -wpd2raw @top_srcdir@/src/csharp/examples/wp_test_document.wpd >$tmp/cpp.out -PATH="$PATH:./.libs" MONO_PATH="$MONO_PATH:./" LD_LIBRARY_PATH=./.libs mono ./examples/wpd2raw.exe @top_srcdir@/src/csharp/examples/wp_test_document.wpd > $tmp/csharp.out +@WPD2RAW@ @top_srcdir@/src/java/examples/wp_test_document.wpd >$tmp/cpp.out +PATH="$PATH:./.libs" MONO_PATH="$MONO_PATH:./" LD_LIBRARY_PATH=./.libs mono ./examples/wpd2raw.exe @top_srcdir@/src/java/examples/wp_test_document.wpd > $tmp/csharp.out diff -uw $tmp/cpp.out $tmp/csharp.out if [ $? == 0 ]; then echo ok |
|
From: Fridrich S. <str...@us...> - 2008-11-21 10:13:39
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1372 Modified Files: configure.in Log Message: fix some configure messages and make the tools detection a bit less painful when crosscompiling Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- configure.in 20 Nov 2008 14:17:03 -0000 1.18 +++ configure.in 21 Nov 2008 10:13:24 -0000 1.19 @@ -46,14 +46,38 @@ AC_PROG_CXX +AC_PROG_EGREP + +AC_PATH_PROG(SWIG, swig) +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]) +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_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 +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 AC_PROG_JAVAC AC_PROG_JAVA AC_PROG_JAR -AC_PROG_EGREP AC_PATH_PROG(GMCS, gmcs, no) -if test -z "GMCS"; then +if test "GMCS" = "no"; then AC_MSG_ERROR([*** Could not find C-sharp compiler that supports generics.]) fi @@ -72,28 +96,6 @@ libwpd-stream-0.9 >= $LIBWPD_REQUIRED_VERSION ]) -AC_PATH_PROG(SWIG, swig) -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]) -if test "`$SWIG -version | $EGREP ^SWIG\ Version | $AWK '{ print $3 }' | cut -d. -f1`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f1`"; then - if test "`$SWIG -version | $EGREP ^SWIG\ Version | $AWK '{ print $3 }' | cut -d. -f2`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f2`"; then - if test "`$SWIG -version | $EGREP ^SWIG\ Version | $AWK '{ print $3 }' | cut -d. -f3`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f3`"; then - AC_MSG_RESULT([OK]) - else - AC_MSG_ERROR([too old, you need at least $SWIG_REQUIRED_VERSION]) - fi - else - AC_MSG_ERROR([too old, you need at least $SWIG_REQUIRED_VERSION]) - fi -else - AC_MSG_ERROR([too old, you need at least $SWIG_REQUIRED_VERSION]) -fi - - - - AC_MSG_CHECKING([for native Win32]) case "$host" in *-*-mingw*) |
|
From: Fridrich S. <str...@us...> - 2008-11-21 10:13:32
|
Update of /cvsroot/libwpd/libwpd2-bindings/m4 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1372/m4 Modified Files: ac_prog_jar.m4 ac_prog_java.m4 ac_prog_javac.m4 Log Message: fix some configure messages and make the tools detection a bit less painful when crosscompiling Index: ac_prog_jar.m4 =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/m4/ac_prog_jar.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ac_prog_jar.m4 30 Oct 2008 10:30:53 -0000 1.1 +++ ac_prog_jar.m4 21 Nov 2008 10:13:25 -0000 1.2 @@ -44,7 +44,9 @@ AC_REQUIRE([AC_EXEEXT])dnl if test "x$JAVAPREFIX" = x; then test "x$JAR" = x && AC_CHECK_PROGS(JAR, jar$EXEEXT) + test "x$JAR" = x && AC_CHECK_PROGS(JAR, jar) else + test "x$JAR" = x && AC_CHECK_PROGS(JAR, jar$EXEEXT, $JAVAPREFIX) test "x$JAR" = x && AC_CHECK_PROGS(JAR, jar, $JAVAPREFIX) fi test "x$JAR" = x && AC_MSG_ERROR([no acceptable jar program found in \$PATH]) Index: ac_prog_java.m4 =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/m4/ac_prog_java.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ac_prog_java.m4 30 Oct 2008 10:30:53 -0000 1.1 +++ ac_prog_java.m4 21 Nov 2008 10:13:25 -0000 1.2 @@ -108,8 +108,10 @@ AC_REQUIRE([AC_EXEEXT])dnl if test x$JAVAPREFIX = x; then test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT) + test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe java) else test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT, $JAVAPREFIX) + test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe java, $JAVAPREFIX) fi test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) AC_PROG_JAVA_WORKS Index: ac_prog_javac.m4 =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/m4/ac_prog_javac.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ac_prog_javac.m4 30 Oct 2008 16:53:33 -0000 1.3 +++ ac_prog_javac.m4 21 Nov 2008 10:13:25 -0000 1.4 @@ -71,11 +71,15 @@ AC_DEFUN([AC_PROG_JAVAC],[ AC_REQUIRE([AC_EXEEXT])dnl if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT) + test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, gcj$EXEEXT guavac$EXEEXT jikes$EXEEXT javac$EXEEXT) + test "x$JAVAC" = x && AC_CHECK_TOOL(JAVAC, gcj) else test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX) + test "x$JAVAC" = x && AC_CHECK_TOOL(JAVAC, gcj, $JAVAPREFIX) fi -echo "$JAVAC" |grep -q javac && JAVAC="$JAVAC -source 5" +AC_PROG_EGREP +echo "$JAVAC" |$EGREP -q javac && JAVAC="$JAVAC -source 5" +echo "$JAVAC" |$EGREP -q gcj && JAVAC="$JAVAC -C" test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AC_PROG_JAVAC_WORKS AC_PROVIDE([$0])dnl |
|
From: Fridrich S. <str...@us...> - 2008-11-20 16:34:29
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java/examples In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7224/src/java/examples Modified Files: Makefile.am Log Message: some cosmetic changes in make check so that it works with more javas Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/examples/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 7 Nov 2008 05:12:51 -0000 1.7 +++ Makefile.am 20 Nov 2008 16:34:17 -0000 1.8 @@ -3,8 +3,8 @@ all: wpd2raw.class: - CLASSPATH=$$CLASSPATH:$(top_builddir)/src/java/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar \ - @JAVAC@ -d $(top_builddir)/src/java/examples $(top_srcdir)/src/java/examples/wpd2raw.java $(top_srcdir)/src/java/examples/RawListenerImpl.java + @JAVAC@ -d $(top_builddir)/src/java/examples -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-11-20 16:34:29
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7224/src/java Modified Files: test.sh.in Log Message: some cosmetic changes in make check so that it works with more javas Index: test.sh.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/test.sh.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- test.sh.in 14 Nov 2008 23:17:58 -0000 1.5 +++ test.sh.in 20 Nov 2008 16:34:17 -0000 1.6 @@ -1,7 +1,7 @@ tmp=`mktemp -d` wpd2raw @top_srcdir@/src/java/examples/wp_test_document.wpd >$tmp/cpp.out -(cd examples && \ -PATH="$PATH:../.libs" CLASSPATH="$CLASSPATH:../wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar" LD_LIBRARY_PATH=../.libs @JAVA@ wpd2raw @top_srcdir@/../src/java/examples/wp_test_document.wpd > $tmp/java.out) +PATH="$PATH:./.libs" 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 diff -uw $tmp/cpp.out $tmp/java.out if [ $? == 0 ]; then echo ok |
|
From: Fridrich S. <str...@us...> - 2008-11-20 14:17:12
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29858/src/csharp Modified Files: .cvsignore Log Message: require swig >= 1.3.30, because lower versions don't understand + ignore some more files Index: .cvsignore =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 6 Nov 2008 19:56:49 -0000 1.3 +++ .cvsignore 20 Nov 2008 14:17:04 -0000 1.4 @@ -8,3 +8,4 @@ Makefile.in test.sh assembly.cs +*.dll.config |
|
From: Fridrich S. <str...@us...> - 2008-11-20 14:17:12
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29858 Modified Files: .cvsignore configure.in Log Message: require swig >= 1.3.30, because lower versions don't understand + ignore some more files Index: .cvsignore =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 6 Nov 2008 10:19:22 -0000 1.2 +++ .cvsignore 20 Nov 2008 14:17:03 -0000 1.3 @@ -18,3 +18,4 @@ stamp-h1 libwpd-bindings.spec libwpd-bindings*.tar.* +*-zip Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- configure.in 17 Nov 2008 12:34:44 -0000 1.17 +++ configure.in 20 Nov 2008 14:17:03 -0000 1.18 @@ -8,6 +8,8 @@ LIBWPD_REQUIRED_VERSION=0.9.0 +SWIG_REQUIRED_VERSION=1.3.30 + WPDBINDINGS_VERSION="$WPDBINDINGS_MAJOR_VERSION.$WPDBINDINGS_MINOR_VERSION.$WPDBINDINGS_MICRO_VERSION" if test x$WPDBINDINGS_MICRO_VERSION = x0; then @@ -48,6 +50,7 @@ AC_PROG_JAVAC AC_PROG_JAVA AC_PROG_JAR +AC_PROG_EGREP AC_PATH_PROG(GMCS, gmcs, no) if test -z "GMCS"; then @@ -73,6 +76,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]) +if test "`$SWIG -version | $EGREP ^SWIG\ Version | $AWK '{ print $3 }' | cut -d. -f1`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f1`"; then + if test "`$SWIG -version | $EGREP ^SWIG\ Version | $AWK '{ print $3 }' | cut -d. -f2`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f2`"; then + if test "`$SWIG -version | $EGREP ^SWIG\ Version | $AWK '{ print $3 }' | cut -d. -f3`" -ge "`echo $SWIG_REQUIRED_VERSION | cut -d. -f3`"; then + AC_MSG_RESULT([OK]) + else + AC_MSG_ERROR([too old, you need at least $SWIG_REQUIRED_VERSION]) + fi + else + AC_MSG_ERROR([too old, you need at least $SWIG_REQUIRED_VERSION]) + fi +else + AC_MSG_ERROR([too old, you need at least $SWIG_REQUIRED_VERSION]) +fi + + + AC_MSG_CHECKING([for native Win32]) case "$host" in |
|
From: Fridrich S. <str...@us...> - 2008-11-19 15:17:55
|
Update of /cvsroot/libwpd/libwpd2 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11831 Modified Files: configure.in Log Message: reverting an accidental version change Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2/configure.in,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- configure.in 19 Nov 2008 09:30:52 -0000 1.61 +++ configure.in 19 Nov 2008 15:17:51 -0000 1.62 @@ -7,7 +7,7 @@ WPD_MINOR_VERSION=9 WPD_MICRO_VERSION=0 -WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION~CVS20081118" +WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" AC_SUBST(WPD_MAJOR_VERSION) AC_SUBST(WPD_MINOR_VERSION) |
|
From: Fridrich S. <str...@us...> - 2008-11-19 13:18:25
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3636/src/csharp Modified Files: Makefile.am Log Message: adapting the bindings to the change in libwpd API Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile.am 18 Nov 2008 00:18:56 -0000 1.14 +++ Makefile.am 19 Nov 2008 13:18:20 -0000 1.15 @@ -52,7 +52,7 @@ CXXFLAGS += $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) LDFLAGS += $(WPDBINDINGS_LIBS) -SHARP_SWIG = SWIGTYPE_p_size_t.cs SWIGTYPE_p_unsigned_char.cs SWIGTYPE_p_WPXEncryption.cs WPDConfidence.cs wpd.cs \ +SHARP_SWIG = SWIGTYPE_p_size_t.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 \ |
|
From: Fridrich S. <str...@us...> - 2008-11-19 13:18:25
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3636/src/java Modified Files: Makefile.am Log Message: adapting the bindings to the change in libwpd API Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/Makefile.am,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile.am 18 Nov 2008 00:18:56 -0000 1.21 +++ Makefile.am 19 Nov 2008 13:18:20 -0000 1.22 @@ -53,10 +53,9 @@ CXXFLAGS += $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) LDFLAGS += $(WPDBINDINGS_LIBS) -JAVA_SWIG = SWIGTYPE_p_size_t.java SWIGTYPE_p_unsigned_char.java \ - SWIGTYPE_p_WPXEncryption.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 \ +JAVA_SWIG = SWIGTYPE_p_size_t.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 JAVA_NOSWIG = WPDocumentJava.java WPXDocumentInterfaceProxy.java WPXDocumentJavaInterface.java |
|
From: Fridrich S. <str...@us...> - 2008-11-19 13:15:47
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3503/src/lib Modified Files: Makefile.am WP1PictureGroup.cpp WP3ResourceFork.cpp WPXBinaryData.cpp WPXBinaryData.h Log Message: fix the -export-symbols option + remove public visibility of WPXEncryption pointer Index: WPXBinaryData.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXBinaryData.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- WPXBinaryData.h 17 Oct 2008 15:05:19 -0000 1.5 +++ WPXBinaryData.h 19 Nov 2008 13:15:34 -0000 1.6 @@ -28,9 +28,8 @@ #include "WPXString.h" #include <stdio.h> -class WPXBinaryDataImpl; class WPXInputStream; -class WPXEncryption; +class WPXBinaryDataImpl; class WPXBinaryData { @@ -38,12 +37,10 @@ WPXBinaryData(); WPXBinaryData(const WPXBinaryData &); WPXBinaryData(const unsigned char *buffer, const size_t bufferSize); - WPXBinaryData(const WPXInputStream *input, WPXEncryption *encryption, const size_t inputSize); ~WPXBinaryData(); void append(const WPXBinaryData &data); void append(const unsigned char *buffer, const size_t bufferSize); - void append(const WPXInputStream *input, WPXEncryption *encryption, const size_t inputSize); void append(const unsigned char c); void clear(); Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/Makefile.am,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- Makefile.am 19 Nov 2008 09:30:52 -0000 1.113 +++ Makefile.am 19 Nov 2008 13:15:34 -0000 1.114 @@ -26,8 +26,8 @@ endif if DEF_FILES -export_symbols_libwpd = "-export-symbols libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def" -export_symbols_libwpd_stream = "-export-symbols libwpd-stream-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def" +export_symbols_libwpd = -export-symbols libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def +export_symbols_libwpd_stream = -export-symbols libwpd-stream-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def else export_symbols_libwpd = export_symbols_libwpd_stream = Index: WPXBinaryData.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXBinaryData.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- WPXBinaryData.cpp 23 Oct 2008 05:14:52 -0000 1.9 +++ WPXBinaryData.cpp 19 Nov 2008 13:15:34 -0000 1.10 @@ -64,14 +64,6 @@ m_binaryDataImpl->m_buf[i] = buffer[i]; } -WPXBinaryData::WPXBinaryData(const WPXInputStream *input, WPXEncryption *encryption, const size_t inputSize) : - m_binaryDataImpl(new WPXBinaryDataImpl) -{ - m_binaryDataImpl->m_buf = std::vector<unsigned char> (inputSize); - for (size_t i = 0; i < inputSize; i++) - m_binaryDataImpl->m_buf[i] = (unsigned char)readU8(const_cast<WPXInputStream *>(input), encryption); -} - void WPXBinaryData::append(const WPXBinaryData &data) { size_t previousSize = m_binaryDataImpl->m_buf.size(); @@ -88,14 +80,6 @@ m_binaryDataImpl->m_buf.push_back(buffer[i]); } -void WPXBinaryData::append(const WPXInputStream *input, WPXEncryption *encryption, const size_t inputSize ) -{ - size_t previousSize = m_binaryDataImpl->m_buf.size(); - m_binaryDataImpl->m_buf.reserve(previousSize + inputSize); - for (size_t i = 0; i < inputSize; i++) - m_binaryDataImpl->m_buf.push_back((unsigned char)readU8(const_cast<WPXInputStream *>(input), encryption)); -} - void WPXBinaryData::append(const unsigned char c) { m_binaryDataImpl->m_buf.push_back(c); Index: WP3ResourceFork.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ResourceFork.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- WP3ResourceFork.cpp 19 Nov 2008 09:30:52 -0000 1.8 +++ WP3ResourceFork.cpp 19 Nov 2008 13:15:34 -0000 1.9 @@ -89,9 +89,11 @@ encryption->setEncryptionMaskBase(0); } } - - WPXBinaryData resourceData(input, encryption, (size_t)resourceDataSize); - + + WPXBinaryData resourceData; + for (size_t k = 0; k < (size_t)resourceDataSize && !input->atEOS(); k++) + resourceData.append((unsigned char)readU8(input, encryption)); + if (encryption) { encryption->setEncryptionStartOffset(oldEncryptionOffset); Index: WP1PictureGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP1PictureGroup.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- WP1PictureGroup.cpp 15 Aug 2008 12:25:37 -0000 1.1 +++ WP1PictureGroup.cpp 19 Nov 2008 13:15:34 -0000 1.2 @@ -56,10 +56,10 @@ if (dataSize + 11 > getSize()) return; input->seek(-2, WPX_SEEK_CUR); - WPXBinaryData tmpBinaryData(input, encryption, dataSize); for (int i = 0; i < 512; i++) m_binaryData.append((unsigned char)0); - m_binaryData.append(tmpBinaryData); + for (size_t j = 0; j < dataSize && !input->atEOS(); j++ ); + m_binaryData.append(readU8(input, encryption)); #if DUMP_PICTURE std::ostringstream filename; filename << "binarydump" << pictureId++ << ".pct"; |
|
From: Fridrich S. <str...@us...> - 2008-11-19 09:31:05
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17824/src/lib Modified Files: Makefile.am WP3ResourceFork.cpp libwpd-0.9.def makefile.mk Log Message: On Win32 (MinGW) allow using def files to limit exported symbols to the ones that are actually part of the API (this allow having a bit smaller Dlls, but it is not very well tested and one can have some symbols unavailable) -- use only if you are ready to file bugs with symbols that are not accessible Index: makefile.mk =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/makefile.mk,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- makefile.mk 15 Aug 2008 12:27:52 -0000 1.18 +++ makefile.mk 19 Nov 2008 09:30:52 -0000 1.19 @@ -67,6 +67,8 @@ $(SLO)$/WP3PageFormatGroup.obj \ $(SLO)$/WP3Parser.obj \ $(SLO)$/WP3Part.obj \ + $(SLO)$/WP3Resource.obj \ + $(SLO)$/WP3ResourceFork.obj \ $(SLO)$/WP3SingleByteFunction.obj \ $(SLO)$/WP3StylesListener.obj \ $(SLO)$/WP3SubDocument.obj \ @@ -76,6 +78,7 @@ $(SLO)$/WP3UnsupportedFixedLengthGroup.obj \ $(SLO)$/WP3UnsupportedVariableLengthGroup.obj \ $(SLO)$/WP3VariableLengthGroup.obj \ + $(SLO)$/WP3WindowGroup.obj \ $(SLO)$/WP42ContentListener.obj \ $(SLO)$/WP42FileStructure.obj \ $(SLO)$/WP42HeaderFooterGroup.obj \ Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/Makefile.am,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- Makefile.am 17 Oct 2008 15:05:19 -0000 1.112 +++ Makefile.am 19 Nov 2008 09:30:52 -0000 1.113 @@ -25,6 +25,14 @@ uninstall-libtool-import-lib: endif +if DEF_FILES +export_symbols_libwpd = "-export-symbols libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def" +export_symbols_libwpd_stream = "-export-symbols libwpd-stream-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def" +else +export_symbols_libwpd = +export_symbols_libwpd_stream = +endif + if WITH_LIBWPD_STREAM target_libwpd_stream = libwpd-stream-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.la else @@ -49,7 +57,7 @@ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = @LIBWPD_WIN32_RESOURCE@ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ -libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) +libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) $(export_symbols_libwpd) libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_SOURCES = \ libwpd_internal.cpp \ libwpd_math.cpp \ @@ -406,7 +414,7 @@ libwpd_stream_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = @LIBWPD_STREAM_WIN32_RESOURCE@ libwpd_stream_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_STREAM_WIN32_RESOURCE@ -libwpd_stream_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) +libwpd_stream_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) $(export_symbols_libwpd_stream) libwpd_stream_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_SOURCES = $(libwpd_stream_sources) endif @@ -432,8 +440,10 @@ $(libwpd_stream_sources) \ $(libwpd_stream_headers) \ makefile.mk \ + libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def \ libwpd.h.in \ libwpd.rc.in \ + libwpd-stream-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.def \ libwpd-stream.h.in \ libwpd-stream.rc.in Index: WP3ResourceFork.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ResourceFork.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- WP3ResourceFork.cpp 23 Oct 2008 09:16:27 -0000 1.7 +++ WP3ResourceFork.cpp 19 Nov 2008 09:30:52 -0000 1.8 @@ -25,6 +25,8 @@ #include "WP3ResourceFork.h" #include "libwpd_internal.h" +#include "WPXStream.h" +#include "WPXEncryption.h" #include <vector> #include <sstream> Index: libwpd-0.9.def =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd-0.9.def,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libwpd-0.9.def 18 Nov 2008 02:25:49 -0000 1.1 +++ libwpd-0.9.def 19 Nov 2008 09:30:52 -0000 1.2 @@ -4,15 +4,18 @@ _ZN10WPDocument5parseEP14WPXInputStreamP20WPXDocumentInterfacePKc _ZN11WPXPropertyD2Ev _ZN13WPXBinaryData5clearEv -_ZN13WPXBinaryData6appendEh -_ZN13WPXBinaryData6appendEPK14WPXInputStreamP13WPXEncryptionj _ZN13WPXBinaryData6appendEPKhj _ZN13WPXBinaryData6appendERKS_ -_ZN13WPXBinaryDataC1EPK14WPXInputStreamP13WPXEncryptionj +_ZN13WPXBinaryData6appendEh _ZN13WPXBinaryDataC1EPKhj _ZN13WPXBinaryDataC1ERKS_ _ZN13WPXBinaryDataC1Ev +_ZN13WPXBinaryDataC2EPKhj +_ZN13WPXBinaryDataC2ERKS_ +_ZN13WPXBinaryDataC2Ev _ZN13WPXBinaryDataD1Ev +_ZN13WPXBinaryDataD2Ev +_ZN13WPXBinaryDataaSERKS_ _ZN15WPXPropertyList4Iter3keyEv _ZN15WPXPropertyList4Iter4lastEv _ZN15WPXPropertyList4Iter4nextEv @@ -23,14 +26,13 @@ _ZN15WPXPropertyList4IterD1Ev _ZN15WPXPropertyList4IterD2Ev _ZN15WPXPropertyList5clearEv -_ZN15WPXPropertyList6insertEPKcb -_ZN15WPXPropertyList6insertEPKcf7WPXUnit -_ZN15WPXPropertyList6insertEPKci _ZN15WPXPropertyList6insertEPKcP11WPXProperty _ZN15WPXPropertyList6insertEPKcRK9WPXString _ZN15WPXPropertyList6insertEPKcS1_ +_ZN15WPXPropertyList6insertEPKcb +_ZN15WPXPropertyList6insertEPKcf7WPXUnit +_ZN15WPXPropertyList6insertEPKci _ZN15WPXPropertyList6removeEPKc -_ZN15WPXPropertyListaSERKS_ _ZN15WPXPropertyListC1ERKS_ _ZN15WPXPropertyListC1Ev _ZN15WPXPropertyListC2ERKS_ @@ -38,6 +40,7 @@ _ZN15WPXPropertyListD0Ev _ZN15WPXPropertyListD1Ev _ZN15WPXPropertyListD2Ev +_ZN15WPXPropertyListaSERKS_ _ZN18WPXPropertyFactory10newIntPropEi _ZN18WPXPropertyFactory11newBoolPropEb _ZN18WPXPropertyFactory11newInchPropEf @@ -71,12 +74,10 @@ _ZN9WPXString4IterD1Ev _ZN9WPXString4IterD2Ev _ZN9WPXString5clearEv -_ZN9WPXString6appendEc _ZN9WPXString6appendEPKc _ZN9WPXString6appendERKS_ +_ZN9WPXString6appendEc _ZN9WPXString7sprintfEPKcz -_ZN9WPXStringaSEPKc -_ZN9WPXStringaSERKS_ _ZN9WPXStringC1EPKc _ZN9WPXStringC1ERKS_ _ZN9WPXStringC1ERKS_b @@ -87,6 +88,8 @@ _ZN9WPXStringC2Ev _ZN9WPXStringD1Ev _ZN9WPXStringD2Ev +_ZN9WPXStringaSEPKc +_ZN9WPXStringaSERKS_ _ZN9WPXStringeqEPKc _ZN9WPXStringeqERKS_ _ZNK13WPXBinaryData13getBase64DataEv @@ -98,8 +101,8 @@ _ZNK21WPXPropertyListVector4IterclEv _ZNK21WPXPropertyListVector5countEv _ZNK9WPXString3lenEv -_ZNK9WPXString4cstrEv _ZNK9WPXString4IterclEv +_ZNK9WPXString4cstrEv _ZTI15WPXPropertyList DATA _ZTI21WPXPropertyListVector DATA _ZTIN15WPXPropertyList4IterE DATA |
|
From: Fridrich S. <str...@us...> - 2008-11-19 09:30:59
|
Update of /cvsroot/libwpd/libwpd2 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17824 Modified Files: configure.in Log Message: On Win32 (MinGW) allow using def files to limit exported symbols to the ones that are actually part of the API (this allow having a bit smaller Dlls, but it is not very well tested and one can have some symbols unavailable) -- use only if you are ready to file bugs with symbols that are not accessible Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2/configure.in,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- configure.in 27 Jul 2008 20:18:20 -0000 1.60 +++ configure.in 19 Nov 2008 09:30:52 -0000 1.61 @@ -7,7 +7,7 @@ WPD_MINOR_VERSION=9 WPD_MICRO_VERSION=0 -WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" +WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION~CVS20081118" AC_SUBST(WPD_MAJOR_VERSION) AC_SUBST(WPD_MINOR_VERSION) @@ -154,6 +154,21 @@ AC_MSG_RESULT($platform_darwin) AM_CONDITIONAL(PLATFORM_DARWIN, test "$platform_darwin" = yes) +AC_ARG_ENABLE(def_files,[ --enable-def-files Enable use of def files to define exported symbols on win32 ],[ + if test x"$native_win32" = xyes; then + case "${enableval}" in + yes) def_files=yes ;; + *) def_files=no ;; + esac + else + def_files=no + fi +],[ def_files=no +]) + +AM_CONDITIONAL(DEF_FILES, test "$def_files" = yes) + + AC_ARG_ENABLE(debug,[ --enable-debug Turn on debugging],[ case "${enableval}" in yes) debug=true ; |
|
From: Fridrich S. <str...@us...> - 2008-11-18 02:25:55
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29273/src/lib Modified Files: WP3Header.cpp WP3Resource.cpp WP5GeneralPacketData.cpp WP5Header.cpp WP60Header.cpp WP61Header.cpp WP6Header.cpp WP6PrefixDataPacket.cpp WP6PrefixIndice.cpp WPXStreamImplementation.cpp Added Files: libwpd-0.9.def libwpd-stream-0.9.def Log Message: adding def files allowing export only symbols that we want to be public + avoid including libwpd.h in libwpd files Index: WP60Header.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP60Header.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- WP60Header.cpp 22 Nov 2007 12:20:36 -0000 1.18 +++ WP60Header.cpp 18 Nov 2008 02:25:49 -0000 1.19 @@ -23,7 +23,6 @@ * Corel Corporation or Corel Corporation Limited." */ -#include "libwpd.h" #include "WP60Header.h" #include "WP6FileStructure.h" #include "libwpd_internal.h" Index: WP6Header.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6Header.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- WP6Header.cpp 22 Nov 2007 12:20:42 -0000 1.22 +++ WP6Header.cpp 18 Nov 2008 02:25:49 -0000 1.23 @@ -23,7 +23,6 @@ * Corel Corporation or Corel Corporation Limited." */ -#include "libwpd.h" #include "WP60Header.h" #include "WP6FileStructure.h" #include "libwpd_internal.h" Index: WP6PrefixDataPacket.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6PrefixDataPacket.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- WP6PrefixDataPacket.cpp 22 Nov 2007 12:20:44 -0000 1.23 +++ WP6PrefixDataPacket.cpp 18 Nov 2008 02:25:49 -0000 1.24 @@ -38,7 +38,6 @@ #include "WP6TableStylePacket.h" #include "WP6GraphicsFilenamePacket.h" #include "WP6GraphicsCachedFileDataPacket.h" -#include "libwpd.h" #include "libwpd_internal.h" WP6PrefixDataPacket::WP6PrefixDataPacket(WPXInputStream * /* input */, WPXEncryption * /* encryption */) : --- NEW FILE: libwpd-stream-0.9.def --- _ZN13WPXFileStream11isOLEStreamEv _ZN13WPXFileStream20getDocumentOLEStreamEPKc _ZN13WPXFileStream4readEjRj _ZN13WPXFileStream4seekEl13WPX_SEEK_TYPE _ZN13WPXFileStream4tellEv _ZN13WPXFileStream5atEOSEv _ZN13WPXFileStreamC1EPKc _ZN13WPXFileStreamC2EPKc _ZN13WPXFileStreamD0Ev _ZN13WPXFileStreamD1Ev _ZN13WPXFileStreamD2Ev _ZN15WPXStringStream11isOLEStreamEv _ZN15WPXStringStream20getDocumentOLEStreamEPKc _ZN15WPXStringStream4readEjRj _ZN15WPXStringStream4seekEl13WPX_SEEK_TYPE _ZN15WPXStringStream4tellEv _ZN15WPXStringStream5atEOSEv _ZN15WPXStringStreamC1EPKhj _ZN15WPXStringStreamC2EPKhj _ZN15WPXStringStreamD0Ev _ZN15WPXStringStreamD1Ev _ZN15WPXStringStreamD2Ev _ZTI13WPXFileStream DATA _ZTI15WPXStringStream DATA _ZTS13WPXFileStream DATA _ZTS15WPXStringStream DATA _ZTV13WPXFileStream DATA _ZTV15WPXStringStream DATA --- NEW FILE: libwpd-0.9.def --- _ZN10WPDocument14verifyPasswordEP14WPXInputStreamPKc _ZN10WPDocument16parseSubDocumentEP14WPXInputStreamP20WPXDocumentInterface13WPDFileFormat _ZN10WPDocument21isFileFormatSupportedEP14WPXInputStream _ZN10WPDocument5parseEP14WPXInputStreamP20WPXDocumentInterfacePKc _ZN11WPXPropertyD2Ev _ZN13WPXBinaryData5clearEv _ZN13WPXBinaryData6appendEh _ZN13WPXBinaryData6appendEPK14WPXInputStreamP13WPXEncryptionj _ZN13WPXBinaryData6appendEPKhj _ZN13WPXBinaryData6appendERKS_ _ZN13WPXBinaryDataC1EPK14WPXInputStreamP13WPXEncryptionj _ZN13WPXBinaryDataC1EPKhj _ZN13WPXBinaryDataC1ERKS_ _ZN13WPXBinaryDataC1Ev _ZN13WPXBinaryDataD1Ev _ZN15WPXPropertyList4Iter3keyEv _ZN15WPXPropertyList4Iter4lastEv _ZN15WPXPropertyList4Iter4nextEv _ZN15WPXPropertyList4Iter6rewindEv _ZN15WPXPropertyList4IterC1ERKS_ _ZN15WPXPropertyList4IterC2ERKS_ _ZN15WPXPropertyList4IterD0Ev _ZN15WPXPropertyList4IterD1Ev _ZN15WPXPropertyList4IterD2Ev _ZN15WPXPropertyList5clearEv _ZN15WPXPropertyList6insertEPKcb _ZN15WPXPropertyList6insertEPKcf7WPXUnit _ZN15WPXPropertyList6insertEPKci _ZN15WPXPropertyList6insertEPKcP11WPXProperty _ZN15WPXPropertyList6insertEPKcRK9WPXString _ZN15WPXPropertyList6insertEPKcS1_ _ZN15WPXPropertyList6removeEPKc _ZN15WPXPropertyListaSERKS_ _ZN15WPXPropertyListC1ERKS_ _ZN15WPXPropertyListC1Ev _ZN15WPXPropertyListC2ERKS_ _ZN15WPXPropertyListC2Ev _ZN15WPXPropertyListD0Ev _ZN15WPXPropertyListD1Ev _ZN15WPXPropertyListD2Ev _ZN18WPXPropertyFactory10newIntPropEi _ZN18WPXPropertyFactory11newBoolPropEb _ZN18WPXPropertyFactory11newInchPropEf _ZN18WPXPropertyFactory11newTwipPropEf _ZN18WPXPropertyFactory12newPointPropEf _ZN18WPXPropertyFactory13newStringPropEPKc _ZN18WPXPropertyFactory13newStringPropERK9WPXString _ZN18WPXPropertyFactory14newPercentPropEf _ZN21WPXPropertyListVector4Iter4lastEv _ZN21WPXPropertyListVector4Iter4nextEv _ZN21WPXPropertyListVector4Iter6rewindEv _ZN21WPXPropertyListVector4IterC1ERKS_ _ZN21WPXPropertyListVector4IterC2ERKS_ _ZN21WPXPropertyListVector4IterD0Ev _ZN21WPXPropertyListVector4IterD1Ev _ZN21WPXPropertyListVector4IterD2Ev _ZN21WPXPropertyListVector6appendERK15WPXPropertyList _ZN21WPXPropertyListVectorC1ERKS_ _ZN21WPXPropertyListVectorC1Ev _ZN21WPXPropertyListVectorC2ERKS_ _ZN21WPXPropertyListVectorC2Ev _ZN21WPXPropertyListVectorD0Ev _ZN21WPXPropertyListVectorD1Ev _ZN21WPXPropertyListVectorD2Ev _ZN9WPXString4Iter4lastEv _ZN9WPXString4Iter4nextEv _ZN9WPXString4Iter6rewindEv _ZN9WPXString4IterC1ERKS_ _ZN9WPXString4IterC2ERKS_ _ZN9WPXString4IterD0Ev _ZN9WPXString4IterD1Ev _ZN9WPXString4IterD2Ev _ZN9WPXString5clearEv _ZN9WPXString6appendEc _ZN9WPXString6appendEPKc _ZN9WPXString6appendERKS_ _ZN9WPXString7sprintfEPKcz _ZN9WPXStringaSEPKc _ZN9WPXStringaSERKS_ _ZN9WPXStringC1EPKc _ZN9WPXStringC1ERKS_ _ZN9WPXStringC1ERKS_b _ZN9WPXStringC1Ev _ZN9WPXStringC2EPKc _ZN9WPXStringC2ERKS_ _ZN9WPXStringC2ERKS_b _ZN9WPXStringC2Ev _ZN9WPXStringD1Ev _ZN9WPXStringD2Ev _ZN9WPXStringeqEPKc _ZN9WPXStringeqERKS_ _ZNK13WPXBinaryData13getBase64DataEv _ZNK13WPXBinaryData13getDataBufferEv _ZNK13WPXBinaryData13getDataStreamEv _ZNK13WPXBinaryData4sizeEv _ZNK15WPXPropertyList4IterclEv _ZNK15WPXPropertyListixEPKc _ZNK21WPXPropertyListVector4IterclEv _ZNK21WPXPropertyListVector5countEv _ZNK9WPXString3lenEv _ZNK9WPXString4cstrEv _ZNK9WPXString4IterclEv _ZTI15WPXPropertyList DATA _ZTI21WPXPropertyListVector DATA _ZTIN15WPXPropertyList4IterE DATA _ZTIN21WPXPropertyListVector4IterE DATA _ZTIN9WPXString4IterE DATA _ZTS15WPXPropertyList DATA _ZTS21WPXPropertyListVector DATA _ZTSN15WPXPropertyList4IterE DATA _ZTSN21WPXPropertyListVector4IterE DATA _ZTSN9WPXString4IterE DATA _ZTV11WPXProperty _ZTV15WPXPropertyList DATA _ZTV21WPXPropertyListVector DATA _ZTVN15WPXPropertyList4IterE DATA _ZTVN21WPXPropertyListVector4IterE DATA _ZTVN9WPXString4IterE DATA Index: WP5GeneralPacketData.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5GeneralPacketData.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- WP5GeneralPacketData.cpp 22 Nov 2007 12:20:32 -0000 1.7 +++ WP5GeneralPacketData.cpp 18 Nov 2008 02:25:49 -0000 1.8 @@ -29,7 +29,6 @@ #include "WP5ListFontsUsedPacket.h" #include "WP5FontNameStringPoolPacket.h" #include "WP5GraphicsInformationPacket.h" -#include "libwpd.h" #include "libwpd_internal.h" WP5GeneralPacketData::WP5GeneralPacketData() Index: WPXStreamImplementation.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXStreamImplementation.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- WPXStreamImplementation.cpp 7 Nov 2008 17:24:23 -0000 1.16 +++ WPXStreamImplementation.cpp 18 Nov 2008 02:25:49 -0000 1.17 @@ -23,7 +23,6 @@ #include "WPXStreamImplementation.h" #include "WPXOLEStream.h" -#include "libwpd.h" #include <fstream> #include <sstream> Index: WP3Resource.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3Resource.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- WP3Resource.cpp 15 Oct 2008 15:02:28 -0000 1.1 +++ WP3Resource.cpp 18 Nov 2008 02:25:49 -0000 1.2 @@ -26,7 +26,6 @@ #include "WP3Resource.h" #include "WP3FileStructure.h" -#include "libwpd.h" #include "libwpd_internal.h" WP3Resource::WP3Resource(uint32_t resourceType, uint32_t resourceReferenceID, const WPXString resourceName, Index: WP3Header.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3Header.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WP3Header.cpp 22 Nov 2007 12:20:23 -0000 1.4 +++ WP3Header.cpp 18 Nov 2008 02:25:49 -0000 1.5 @@ -22,7 +22,6 @@ * Corel Corporation or Corel Corporation Limited." */ -#include "libwpd.h" #include "WP3Header.h" #include "libwpd_internal.h" Index: WP6PrefixIndice.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6PrefixIndice.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- WP6PrefixIndice.cpp 22 Nov 2007 12:20:45 -0000 1.13 +++ WP6PrefixIndice.cpp 18 Nov 2008 02:25:49 -0000 1.14 @@ -25,7 +25,6 @@ #include "WP6PrefixIndice.h" #include "WP6FileStructure.h" -#include "libwpd.h" #include "libwpd_internal.h" WP6PrefixIndice::WP6PrefixIndice(WPXInputStream * input, WPXEncryption *encryption, int id) Index: WP5Header.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5Header.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- WP5Header.cpp 22 Nov 2007 12:20:33 -0000 1.11 +++ WP5Header.cpp 18 Nov 2008 02:25:49 -0000 1.12 @@ -23,7 +23,6 @@ * Corel Corporation or Corel Corporation Limited." */ -#include "libwpd.h" #include "WP5Header.h" #include "libwpd_internal.h" Index: WP61Header.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP61Header.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- WP61Header.cpp 22 Nov 2007 12:20:36 -0000 1.16 +++ WP61Header.cpp 18 Nov 2008 02:25:49 -0000 1.17 @@ -23,7 +23,6 @@ * Corel Corporation or Corel Corporation Limited." */ -#include "libwpd.h" #include "WP61Header.h" #include "WP6FileStructure.h" #include "libwpd_internal.h" |
|
From: Fridrich S. <str...@us...> - 2008-11-18 00:19:05
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11748/src/csharp Modified Files: Makefile.am Log Message: some more fixes Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile.am 17 Nov 2008 10:24:25 -0000 1.13 +++ Makefile.am 18 Nov 2008 00:18:56 -0000 1.14 @@ -18,24 +18,18 @@ endif if OS_WIN32 -version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version - install-libtool-import-lib: $(INSTALL) @WPDBINDINGS_OBJDIR@/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: -rm $(DESTDIR)$(libdir)/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.a - -@WPDSHARP_WIN32_RESOURCE@ : libwpd-sharp.rc $(libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_OBJECTS) - chmod +x $(top_srcdir)/build/win32/*compile-resource && \ - WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource libwpd-sharp.rc @WPDSHARP_WIN32_RESOURCE@ - else -version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version install-libtool-import-lib: uninstall-libtool-import-lib: endif +version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version + lib_LTLIBRARIES = libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.la INCLUDES = -I$(srcdir) @@ -47,8 +41,12 @@ libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_DEPENDENCIES = @WPDSHARP_WIN32_RESOURCE@ nodist_libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_SOURCES = wpd_sharp_wrap.cxx wpd_sharp_wrap.hxx -top_srcdir = @top_srcdir@ -prefix = @prefix@ + +if OS_WIN32 +@WPDSHARP_WIN32_RESOURCE@ : libwpd-sharp.rc $(libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_OBJECTS) + chmod +x $(top_srcdir)/build/win32/*compile-resource && \ + WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource libwpd-sharp.rc @WPDSHARP_WIN32_RESOURCE@ +endif CXXFLAGS += -fno-strict-aliasing # see the swig docs CXXFLAGS += $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) |
|
From: Fridrich S. <str...@us...> - 2008-11-18 00:19:03
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11748/src/java Modified Files: Makefile.am Log Message: some more fixes Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile.am 14 Nov 2008 22:07:39 -0000 1.20 +++ Makefile.am 18 Nov 2008 00:18:56 -0000 1.21 @@ -14,24 +14,19 @@ endif if OS_WIN32 -version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version - install-libtool-import-lib: $(INSTALL) @WPDBINDINGS_OBJDIR@/libwpd-java-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: -rm $(DESTDIR)$(libdir)/libwpd-java-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.a -@WPDJAVA_WIN32_RESOURCE@ : libwpd-java.rc $(libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_OBJECTS) - chmod +x $(top_srcdir)/build/win32/*compile-resource && \ - WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource libwpd-java.rc @WPDJAVA_WIN32_RESOURCE@ - else -version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version install-libtool-import-lib: uninstall-libtool-import-lib: endif +version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version + lib_LTLIBRARIES = libwpd-java-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.la INCLUDES = -I$(srcdir) @@ -43,10 +38,15 @@ libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_DEPENDENCIES = @WPDJAVA_WIN32_RESOURCE@ nodist_libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_SOURCES = wpd_java_wrap.cxx wpd_java_wrap.hxx -EXTRA_DIST = test.sh +if OS_WIN32 -top_srcdir = @top_srcdir@ -prefix = @prefix@ +@WPDJAVA_WIN32_RESOURCE@ : libwpd-java.rc $(libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_OBJECTS) + chmod +x $(top_srcdir)/build/win32/*compile-resource && \ + WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource libwpd-java.rc @WPDJAVA_WIN32_RESOURCE@ + +endif + +EXTRA_DIST = test.sh CXXFLAGS += -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux/ CXXFLAGS += -fno-strict-aliasing # see the swig docs |
|
From: Fridrich S. <str...@us...> - 2008-11-17 13:46:56
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15589/src/csharp Modified Files: libwpd-sharp-0.9.pc.in Log Message: fix the pkgconfig file Index: libwpd-sharp-0.9.pc.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/libwpd-sharp-0.9.pc.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libwpd-sharp-0.9.pc.in 6 Nov 2008 19:56:49 -0000 1.1 +++ libwpd-sharp-0.9.pc.in 17 Nov 2008 13:46:45 -0000 1.2 @@ -1,9 +1,10 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ +libexecdir=@libexecdir@ includedir=@includedir@ Name: libwpd-sharp Description: C# binding for libwpd Version: 1.0 -Libs: -r:${libdir}/mono/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll +Libs: -r:${libexecdir}/mono/libwpd/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll |
1 message has been excluded from this view by a project administrator.
