WPDocument.h   WPDocument.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2003-2005 William Lachance (wrlach@gmail.com) * Copyright (C) 2003-2005 William Lachance (wrlach@gmail.com)
* Copyright (C) 2003 Marc Maurer (uwog@uwog.net) * Copyright (C) 2003 Marc Maurer (uwog@uwog.net)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
skipping to change at line 53 skipping to change at line 54
class WPDocument class WPDocument
{ {
public: public:
static WPDConfidence isFileFormatSupported(WPXInputStream *input); static WPDConfidence isFileFormatSupported(WPXInputStream *input);
static WPDPasswordMatch verifyPassword(WPXInputStream *input, const char *password); static WPDPasswordMatch verifyPassword(WPXInputStream *input, const char *password);
static WPDResult parse(WPXInputStream *input, WPXDocumentInterface * documentInterface, const char *password); static WPDResult parse(WPXInputStream *input, WPXDocumentInterface * documentInterface, const char *password);
static WPDResult parseSubDocument(WPXInputStream *input, WPXDocument Interface *documentInterface, WPDFileFormat fileFormat); static WPDResult parseSubDocument(WPXInputStream *input, WPXDocument Interface *documentInterface, WPDFileFormat fileFormat);
}; };
#endif /* WPDOCUMENT_H */ #endif /* WPDOCUMENT_H */
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 2 change blocks. 
0 lines changed or deleted 1 lines changed or added


 WPXBinaryData.h   WPXBinaryData.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2007 Fridrich Strba (fridrich.strba@bluewin.ch) * Copyright (C) 2007 Fridrich Strba (fridrich.strba@bluewin.ch)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 51 skipping to change at line 52
void append(const WPXBinaryData &data); void append(const WPXBinaryData &data);
void append(const unsigned char *buffer, const unsigned long bufferS ize); void append(const unsigned char *buffer, const unsigned long bufferS ize);
void append(const unsigned char c); void append(const unsigned char c);
void clear(); void clear();
unsigned long size() const; unsigned long size() const;
const unsigned char *getDataBuffer() const; const unsigned char *getDataBuffer() const;
const WPXString getBase64Data() const; const WPXString getBase64Data() const;
const WPXInputStream *getDataStream() const; const WPXInputStream *getDataStream() const;
WPXBinaryData& operator=(const WPXBinaryData &); WPXBinaryData &operator=(const WPXBinaryData &);
private: private:
WPXBinaryDataImpl *m_binaryDataImpl; WPXBinaryDataImpl *m_binaryDataImpl;
}; };
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 3 change blocks. 
1 lines changed or deleted 2 lines changed or added


 WPXDocumentInterface.h   WPXDocumentInterface.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2002-2005 William Lachance (wrlach@gmail.com) * Copyright (C) 2002-2005 William Lachance (wrlach@gmail.com)
* Copyright (C) 2002 Marc Maurer (uwog@uwog.net) * Copyright (C) 2002 Marc Maurer (uwog@uwog.net)
* Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
skipping to change at line 43 skipping to change at line 44
/** /**
Pure virtual class containing all the callback functions that can be made b y Pure virtual class containing all the callback functions that can be made b y
the parser. An application using this library should implement all the func tion the parser. An application using this library should implement all the func tion
definitions listed here. definitions listed here.
*/ */
class WPXInputStream; class WPXInputStream;
class WPXDocumentInterface class WPXDocumentInterface
{ {
public: public:
virtual ~WPXDocumentInterface() {} virtual ~WPXDocumentInterface() {}
/** /**
Called when all document metadata should be set. This is always the first callback made. Called when all document metadata should be set. This is always the first callback made.
\param propList Property list for the metadata. May contain: \param propList Property list for the metadata. May contain:
\li \c dc:creator \li \c dc:creator
\li \c dc:language The document's keywords \li \c dc:language The document's keywords
\li \c dc:publisher The document's publisher \li \c dc:publisher The document's publisher
\li \c dc:source \li \c dc:source
\li \c dc:subject The document's subject \li \c dc:subject The document's subject
\li \c dc:type The document's type \li \c dc:type The document's type
skipping to change at line 101 skipping to change at line 102
\li \c libwpd:security \li \c libwpd:security
\li \c libwpd:status \li \c libwpd:status
\li \c libwpd:telephone-number \li \c libwpd:telephone-number
\li \c libwpd:version-notes \li \c libwpd:version-notes
\li \c libwpd:version-number \li \c libwpd:version-number
\li \c meta:creation-date Document creation date \li \c meta:creation-date Document creation date
\li \c meta:initial-creator The document's author \li \c meta:initial-creator The document's author
\li \c meta:keyword The document's keywords \li \c meta:keyword The document's keywords
\li \c \li \c
*/ */
virtual void setDocumentMetaData(const WPXPropertyList &propList) = 0; virtual void setDocumentMetaData(const WPXPropertyList &propList) = 0;
/** /**
Called at the start of the parsing process. This is always the secon d callback made. Called at the start of the parsing process. This is always the secon d callback made.
*/ */
virtual void startDocument() = 0; virtual void startDocument() = 0;
/** /**
Called at the end of the parsing process. This is always the last c allback made. Called at the end of the parsing process. This is always the las t callback made.
*/ */
virtual void endDocument() = 0; virtual void endDocument() = 0;
virtual void definePageStyle(const WPXPropertyList &propList) = 0; virtual void definePageStyle(const WPXPropertyList &propList) = 0;
/** /**
Called when a new page span is opened. This will always be called be fore any actual content is placed into Called when a new page span is opened. This will always be called be fore any actual content is placed into
the document. the document.
\param propList Property list for the page span. May contain: \param propList Property list for the page span. May contain:
\li \c libwpd:num-pages The length of this span, in number of pages \li \c libwpd:num-pages The length of this span, in number of pages
skipping to change at line 241 skipping to change at line 242
*/ */
virtual void insertSpace() = 0; virtual void insertSpace() = 0;
/** /**
Called when a string of text should be inserted Called when a string of text should be inserted
\param text A textbuffer encoded as a UTF8 string \param text A textbuffer encoded as a UTF8 string
*/ */
virtual void insertText(const WPXString &text) = 0; virtual void insertText(const WPXString &text) = 0;
/** /**
Called when a line break should be inserted Called when a line break should be inserted
*/ */
virtual void insertLineBreak() = 0; virtual void insertLineBreak() = 0;
/** /**
Called when a field should be inserted. Field types may include: Called when a field should be inserted. Field types may include:
\li \c text:page-number Current page number \li \c text:page-number Current page number
\li \c text:page-count Total # of pages in document \li \c text:page-count Total # of pages in document
\param propList Defines a set of properties for the field. May conta in: \param propList Defines a set of properties for the field. May conta in:
\li \c style:num-format Type of page number (for page number) \li \c style:num-format Type of page number (for page number)
*/ */
virtual void insertField(const WPXString &type, const WPXPropertyLis t &propList) = 0; virtual void insertField(const WPXString &type, const WPXPropertyLis t &propList) = 0;
skipping to change at line 371 skipping to change at line 372
Called when a table should be opened Called when a table should be opened
\param propList Defines a set of properties for the table. May conta in: \param propList Defines a set of properties for the table. May conta in:
\li \c table:align The alignment (left, right, center, or margins) \li \c table:align The alignment (left, right, center, or margins)
\li \c fo:margin-left The left indentation of the table, in inches \li \c fo:margin-left The left indentation of the table, in inches
\li \c fo:margin-right The right indentation of the table, in inches \li \c fo:margin-right The right indentation of the table, in inches
\li \c style:width Total width of the table, in inches \li \c style:width Total width of the table, in inches
\li \c fo:break-before Whether this table should be placed in a new column or page (the value is set to column or page if so) \li \c fo:break-before Whether this table should be placed in a new column or page (the value is set to column or page if so)
\param columns Column definitions for the table. May contain \param columns Column definitions for the table. May contain
\li \c style:column-width Width of a column, in inches \li \c style:column-width Width of a column, in inches
*/ */
virtual void openTable(const WPXPropertyList &propList, const WPXPro pertyListVector &columns) = 0; virtual void openTable(const WPXPropertyList &propList, const WPXPro pertyListVector &columns) = 0;
/** /**
Called when a new table row is opened Called when a new table row is opened
\param propList Defines a set of properties for the table row. May c ontain: \param propList Defines a set of properties for the table row. May c ontain:
\li \c style:row-height The row's height, in inches \li \c style:row-height The row's height, in inches
\li \c style:min-row-height The row's minimum height, in inches \li \c style:min-row-height The row's minimum height, in inches
\li \c libwpd:is-header-row This row contains headings of columns an d should repeat at every page (for tables that span several pages) \li \c libwpd:is-header-row This row contains headings of columns an d should repeat at every page (for tables that span several pages)
*/ */
virtual void openTableRow(const WPXPropertyList &propList) = 0; virtual void openTableRow(const WPXPropertyList &propList) = 0;
/** /**
Called when the current table row is closed Called when the current table row is closed
*/ */
virtual void closeTableRow() = 0; virtual void closeTableRow() = 0;
/** /**
Called when a new table cell is opened Called when a new table cell is opened
\param propList Property list for the table cell. May contain: \param propList Property list for the table cell. May contain:
\li \c libwpd:column Number of the column in which the cell is posit ioned \li \c libwpd:column Number of the column in which the cell is posit ioned
\li \c libwpd:row Number of the row in which the cell is positioned \li \c libwpd:row Number of the row in which the cell is positioned
\li \c table:number-columns-spanned Number of columns that the cell spans \li \c table:number-columns-spanned Number of columns that the cell spans
\li \c table:number-rows-spanned Number of rows that the cell spans \li \c table:number-rows-spanned Number of rows that the cell spans
\li \c fo:border-left Properties of the left border of the cell \li \c fo:border-left Properties of the left border of the cell
\li \c fo:border-right Properties of the right border of the cell \li \c fo:border-right Properties of the right border of the cell
\li \c fo:border-top Properties of the top border of the cell \li \c fo:border-top Properties of the top border of the cell
\li \c fo:border-bottom Properties of the bottom border of the cell \li \c fo:border-bottom Properties of the bottom border of the cell
\li \c fo:background-color Color of the cell (encoded in hex: \#RRGG BB) \li \c fo:background-color Color of the cell (encoded in hex: \#RRGG BB)
\li \c style:vertical-align Vertical alignment of the content in the cell (top, middle, or bottom) \li \c style:vertical-align Vertical alignment of the content in the cell (top, middle, or bottom)
*/ */
virtual void openTableCell(const WPXPropertyList &propList) = 0; virtual void openTableCell(const WPXPropertyList &propList) = 0;
/** /**
Called when the current table cell is closed Called when the current table cell is closed
*/ */
virtual void closeTableCell() = 0; virtual void closeTableCell() = 0;
/** /**
Called when a covered (spanned by another cell in the table) table c ell is opened Called when a covered (spanned by another cell in the table) table c ell is opened
\param propList Property list for the table cell. May contain: \param propList Property list for the table cell. May contain:
\li \c libwpd:column Number of the column in which the cell is posit ioned \li \c libwpd:column Number of the column in which the cell is posit ioned
\li \c libwpd:row Number of the row in which the cell is positioned \li \c libwpd:row Number of the row in which the cell is positioned
*/ */
virtual void insertCoveredTableCell(const WPXPropertyList &propList) = 0; virtual void insertCoveredTableCell(const WPXPropertyList &propList) = 0;
/** /**
Called when the current table is closed Called when the current table is closed
*/ */
virtual void closeTable() = 0; virtual void closeTable() = 0;
/** /**
Called when a positioned box should be opened Called when a positioned box should be opened
\param propList Defines a set of properties for the box. May contain : \param propList Defines a set of properties for the box. May contain :
\li \c text:anchor-type How the Box is anchored (page, frame, paragr aph, char, as-char) \li \c text:anchor-type How the Box is anchored (page, frame, paragr aph, char, as-char)
\li \c svg:x Horizontal position of the box (in inches) \li \c svg:x Horizontal position of the box (in inches)
\li \c svg:y Vertical position of the box (in inches) \li \c svg:y Vertical position of the box (in inches)
\li \c style:horizontal-pos Horizontal alignment of the box (left, c enter, right, from-left, inside, outside, from-inside) \li \c style:horizontal-pos Horizontal alignment of the box (left, c enter, right, from-left, inside, outside, from-inside)
\li \c style:horizontal-rel From where the horizontal position of th e box is measured (page, page-content, page-start-margin, page-end-margin, frame, frame-content, frame-start-margin, frame-end-margin, paragraph, para graph-content, paragraph-start-margin, paragraph-end-margin, char) \li \c style:horizontal-rel From where the horizontal position of th e box is measured (page, page-content, page-start-margin, page-end-margin, frame, frame-content, frame-start-margin, frame-end-margin, paragraph, para graph-content, paragraph-start-margin, paragraph-end-margin, char)
\li \c style:vertical-pos Vertical alignment of the box \li \c style:vertical-pos Vertical alignment of the box
\li \c style:vertical-rel From where the vertical position of the bo x is measured \li \c style:vertical-rel From where the vertical position of the bo x is measured
skipping to change at line 451 skipping to change at line 452
/** /**
Called when a mathml object should be inserted Called when a mathml object should be inserted
\param propList Defines a set of properties for the object. \param propList Defines a set of properties for the object.
\li \c libwpd:mimetype The mimetype of the object \li \c libwpd:mimetype The mimetype of the object
\param data Reference to the string containing the equation represen tation \param data Reference to the string containing the equation represen tation
*/ */
virtual void insertEquation(const WPXPropertyList &propList, const W PXString &data) = 0; virtual void insertEquation(const WPXPropertyList &propList, const W PXString &data) = 0;
}; };
#endif /* WPXDOCUMENTINTERFACEIMPL_H */ #endif /* WPXDOCUMENTINTERFACEIMPL_H */
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 10 change blocks. 
9 lines changed or deleted 10 lines changed or added


 WPXProperty.h   WPXProperty.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2004 William Lachance (wrlach@gmail.com) * Copyright (C) 2004 William Lachance (wrlach@gmail.com)
* Copyright (C) 2005 Net Integration Technologies (http://www.net-itech.co m) * Copyright (C) 2005 Net Integration Technologies (http://www.net-itech.co m)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
skipping to change at line 39 skipping to change at line 40
enum WPXUnit { WPX_INCH, WPX_PERCENT, WPX_POINT, WPX_TWIP, WPX_GENERIC }; enum WPXUnit { WPX_INCH, WPX_PERCENT, WPX_POINT, WPX_TWIP, WPX_GENERIC };
class WPXProperty class WPXProperty
{ {
public: public:
virtual ~WPXProperty(); virtual ~WPXProperty();
virtual int getInt() const = 0; virtual int getInt() const = 0;
virtual double getDouble() const = 0; virtual double getDouble() const = 0;
virtual WPXString getStr() const = 0; virtual WPXString getStr() const = 0;
virtual WPXProperty * clone() const = 0; virtual WPXProperty *clone() const = 0;
}; };
class WPXPropertyFactory class WPXPropertyFactory
{ {
public: public:
static WPXProperty * newStringProp(const WPXString &str); static WPXProperty *newStringProp(const WPXString &str);
static WPXProperty * newStringProp(const char *str); static WPXProperty *newStringProp(const char *str);
static WPXProperty * newIntProp(const int val); static WPXProperty *newIntProp(const int val);
static WPXProperty * newBoolProp(const bool val); static WPXProperty *newBoolProp(const bool val);
static WPXProperty * newDoubleProp(const double val); static WPXProperty *newDoubleProp(const double val);
static WPXProperty * newInchProp(const double val); static WPXProperty *newInchProp(const double val);
static WPXProperty * newPercentProp(const double val); static WPXProperty *newPercentProp(const double val);
static WPXProperty * newPointProp(const double val); static WPXProperty *newPointProp(const double val);
static WPXProperty * newTwipProp(const double val); static WPXProperty *newTwipProp(const double val);
}; };
#endif /* WPXPROPERTY_H */ #endif /* WPXPROPERTY_H */
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 4 change blocks. 
10 lines changed or deleted 11 lines changed or added


 WPXPropertyList.h   WPXPropertyList.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2004 William Lachance (wrlach@gmail.com) * Copyright (C) 2004 William Lachance (wrlach@gmail.com)
* Copyright (C) 2005 Net Integration Technologies (http://www.net-itech.co m) * Copyright (C) 2005 Net Integration Technologies (http://www.net-itech.co m)
* Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
skipping to change at line 43 skipping to change at line 44
class WPXMapImpl; class WPXMapImpl;
class WPXMapIterImpl; class WPXMapIterImpl;
class WPXPropertyList class WPXPropertyList
{ {
public: public:
WPXPropertyList(); WPXPropertyList();
WPXPropertyList(const WPXPropertyList &); WPXPropertyList(const WPXPropertyList &);
virtual ~WPXPropertyList(); virtual ~WPXPropertyList();
void insert(const char * name, WPXProperty *prop); void insert(const char *name, WPXProperty *prop);
void insert(const char * name, const char *val); void insert(const char *name, const char *val);
void insert(const char * name, const int val); void insert(const char *name, const int val);
void insert(const char * name, const bool val); void insert(const char *name, const bool val);
void insert(const char * name, const WPXString &val); void insert(const char *name, const WPXString &val);
void insert(const char * name, const double val, const WPXUnit units void insert(const char *name, const double val, const WPXUnit units
= WPX_INCH); = WPX_INCH);
void remove(const char * name); void remove(const char *name);
const WPXProperty * operator[](const char *name) const; const WPXProperty *operator[](const char *name) const;
const WPXPropertyList& operator=(const WPXPropertyList& propList); const WPXPropertyList &operator=(const WPXPropertyList &propList);
void clear(); void clear();
class Iter class Iter
{ {
public: public:
Iter(const WPXPropertyList &propList); Iter(const WPXPropertyList &propList);
virtual ~Iter(); virtual ~Iter();
void rewind(); void rewind();
bool next(); bool next();
bool last(); bool last();
const WPXProperty * operator()() const; const WPXProperty *operator()() const;
const char * key(); const char *key();
private: private:
WPXMapIterImpl *m_iterImpl; WPXMapIterImpl *m_iterImpl;
Iter(const Iter&); Iter(const Iter &);
Iter& operator=(const Iter&); Iter &operator=(const Iter &);
}; };
friend class WPXPropertyList::Iter; friend class WPXPropertyList::Iter;
private: private:
mutable WPXMapImpl *m_mapImpl; mutable WPXMapImpl *m_mapImpl;
}; };
#endif /* WPXPROPERTYLIST_H */ #endif /* WPXPROPERTYLIST_H */
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 6 change blocks. 
14 lines changed or deleted 15 lines changed or added


 WPXPropertyListVector.h   WPXPropertyListVector.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2005 William Lachance (wrlach@gmail.com) * Copyright (C) 2005 William Lachance (wrlach@gmail.com)
* Copyright (C) 2005 Net Integration Technologies, Inc. (http://www.net-it ech.com) * Copyright (C) 2005 Net Integration Technologies, Inc. (http://www.net-it ech.com)
* Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
skipping to change at line 44 skipping to change at line 45
class WPXPropertyListVector class WPXPropertyListVector
{ {
public: public:
WPXPropertyListVector(const WPXPropertyListVector &); WPXPropertyListVector(const WPXPropertyListVector &);
WPXPropertyListVector(); WPXPropertyListVector();
virtual ~WPXPropertyListVector(); virtual ~WPXPropertyListVector();
void append(const WPXPropertyList &elem); void append(const WPXPropertyList &elem);
void append(const WPXPropertyListVector &vec); void append(const WPXPropertyListVector &vec);
unsigned long count() const; unsigned long count() const;
const WPXPropertyList& operator[](unsigned long index) const; const WPXPropertyList &operator[](unsigned long index) const;
WPXPropertyListVector& operator=(const WPXPropertyListVector& vect); WPXPropertyListVector &operator=(const WPXPropertyListVector &vect);
class Iter class Iter
{ {
public: public:
Iter(const WPXPropertyListVector &vect); Iter(const WPXPropertyListVector &vect);
virtual ~Iter(); virtual ~Iter();
void rewind(); void rewind();
bool next(); bool next();
bool last(); bool last();
const WPXPropertyList & operator()() const; const WPXPropertyList &operator()() const;
private: private:
WPXPropertyListVectorIterImpl *m_iterImpl; WPXPropertyListVectorIterImpl *m_iterImpl;
Iter(const Iter&); Iter(const Iter &);
Iter& operator=(const Iter&); Iter &operator=(const Iter &);
}; };
friend class WPXPropertyListVector::Iter; friend class WPXPropertyListVector::Iter;
private: private:
WPXPropertyListVectorImpl *m_impl; WPXPropertyListVectorImpl *m_impl;
}; };
#endif /* WPXPROPERTYLISTVECTOR_H */ #endif /* WPXPROPERTYLISTVECTOR_H */
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 5 change blocks. 
5 lines changed or deleted 6 lines changed or added


 WPXStream.h   WPXStream.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2004-2005 William Lachance (wrlach@gmail.com) * Copyright (C) 2004-2005 William Lachance (wrlach@gmail.com)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 52 skipping to change at line 53
\return A boolean value that should be true if the input stream is a n OLE2 storage \return A boolean value that should be true if the input stream is a n OLE2 storage
and false if it is not the case and false if it is not the case
*/ */
virtual bool isOLEStream() = 0; virtual bool isOLEStream() = 0;
/** /**
Extracts a \c PerfectOffice_MAIN stream from an OLE2 storage. Extracts a \c PerfectOffice_MAIN stream from an OLE2 storage.
\return Should be a pointer to WPXInputStream constructed from the \ c PerfectOffice_MAIN stream if it exists. \return Should be a pointer to WPXInputStream constructed from the \ c PerfectOffice_MAIN stream if it exists.
\return Should be 0, if the \c PerfectOffice_MAIN stream does not ex ist inside the OLE2 storage \return Should be 0, if the \c PerfectOffice_MAIN stream does not ex ist inside the OLE2 storage
or if the input stream is not an OLE2 storage. or if the input stream is not an OLE2 storage.
*/ */
virtual WPXInputStream * getDocumentOLEStream(const char *name) = 0; virtual WPXInputStream *getDocumentOLEStream(const char *name) = 0;
/** /**
Tries to read a given number of bytes starting from the current posi tion inside the input stream. Tries to read a given number of bytes starting from the current posi tion inside the input stream.
\param numBytes Number of bytes desired to be read. \param numBytes Number of bytes desired to be read.
\param numBytesRead Number of bytes that were possible to be read. \param numBytesRead Number of bytes that were possible to be read.
\return Should be a pointer to an array of numBytesRead bytes (unsig ned char[numBytesRead]). \return Should be a pointer to an array of numBytesRead bytes (unsig ned char[numBytesRead]).
\return Optionally it could be 0 if the desired number of bytes coul d not be read. \return Optionally it could be 0 if the desired number of bytes coul d not be read.
*/ */
virtual const unsigned char *read(unsigned long numBytes, unsigned l ong &numBytesRead) = 0; virtual const unsigned char *read(unsigned long numBytes, unsigned l ong &numBytesRead) = 0;
/** /**
skipping to change at line 86 skipping to change at line 87
*/ */
virtual long tell() = 0; virtual long tell() = 0;
/** /**
Determines whether the current position is at the end of the stream. Determines whether the current position is at the end of the stream.
\return A boolean value that should be true if the next location to be read in the input stream \return A boolean value that should be true if the next location to be read in the input stream
is beyond its end. In all other cases, it should be false. is beyond its end. In all other cases, it should be false.
*/ */
virtual bool atEOS() = 0; virtual bool atEOS() = 0;
}; };
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 3 change blocks. 
1 lines changed or deleted 2 lines changed or added


 WPXStreamImplementation.h   WPXStreamImplementation.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 32 skipping to change at line 33
#ifndef __WPXSTREAMIMPLEMENTATION_H__ #ifndef __WPXSTREAMIMPLEMENTATION_H__
#define __WPXSTREAMIMPLEMENTATION_H__ #define __WPXSTREAMIMPLEMENTATION_H__
#include "WPXStream.h" #include "WPXStream.h"
class WPXFileStreamPrivate; class WPXFileStreamPrivate;
class WPXFileStream: public WPXInputStream class WPXFileStream: public WPXInputStream
{ {
public: public:
explicit WPXFileStream(const char* filename); explicit WPXFileStream(const char *filename);
~WPXFileStream(); ~WPXFileStream();
const unsigned char *read(unsigned long numBytes, unsigned long &num BytesRead); const unsigned char *read(unsigned long numBytes, unsigned long &num BytesRead);
long tell(); long tell();
int seek(long offset, WPX_SEEK_TYPE seekType); int seek(long offset, WPX_SEEK_TYPE seekType);
bool atEOS(); bool atEOS();
bool isOLEStream(); bool isOLEStream();
WPXInputStream *getDocumentOLEStream(const char * name); WPXInputStream *getDocumentOLEStream(const char *name);
private: private:
WPXFileStreamPrivate* d; WPXFileStreamPrivate *d;
WPXFileStream(const WPXFileStream&); // copy is not allowed WPXFileStream(const WPXFileStream &); // copy is not allowed
WPXFileStream& operator=(const WPXFileStream&); // assignment is not WPXFileStream &operator=(const WPXFileStream &); // assignment is no
allowed t allowed
}; };
class WPXStringStreamPrivate; class WPXStringStreamPrivate;
class WPXStringStream: public WPXInputStream class WPXStringStream: public WPXInputStream
{ {
public: public:
WPXStringStream(const unsigned char *data, const unsigned int dataSi ze); WPXStringStream(const unsigned char *data, const unsigned int dataSi ze);
~WPXStringStream(); ~WPXStringStream();
const unsigned char *read(unsigned long numBytes, unsigned long &num BytesRead); const unsigned char *read(unsigned long numBytes, unsigned long &num BytesRead);
long tell(); long tell();
int seek(long offset, WPX_SEEK_TYPE seekType); int seek(long offset, WPX_SEEK_TYPE seekType);
bool atEOS(); bool atEOS();
bool isOLEStream(); bool isOLEStream();
WPXInputStream *getDocumentOLEStream(const char * name); WPXInputStream *getDocumentOLEStream(const char *name);
private: private:
WPXStringStreamPrivate* d; WPXStringStreamPrivate *d;
WPXStringStream(const WPXStringStream&); // copy is not allowed WPXStringStream(const WPXStringStream &); // copy is not allowed
WPXStringStream& operator=(const WPXStringStream&); // assignment is WPXStringStream &operator=(const WPXStringStream &); // assignment i
not allowed s not allowed
}; };
#endif // __WPXSTREAMIMPLEMENTATION_H__ #endif // __WPXSTREAMIMPLEMENTATION_H__
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 7 change blocks. 
11 lines changed or deleted 12 lines changed or added


 WPXString.h   WPXString.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2004 William Lachance (wrlach@gmail.com) * Copyright (C) 2004 William Lachance (wrlach@gmail.com)
* Copyright (C) 2005 Net Integration Technologies (http://www.net-itech.co m) * Copyright (C) 2005 Net Integration Technologies (http://www.net-itech.co m)
* Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
skipping to change at line 40 skipping to change at line 41
class WPXStringImpl; class WPXStringImpl;
class WPXString class WPXString
{ {
public: public:
WPXString(); WPXString();
WPXString(const WPXString &, bool escapeXML = false); WPXString(const WPXString &, bool escapeXML = false);
WPXString(const char *str); WPXString(const char *str);
~WPXString(); ~WPXString();
const char * cstr() const; const char *cstr() const;
int len() const; int len() const;
void sprintf(const char *format, ...); void sprintf(const char *format, ...);
void append(const WPXString &s); void append(const WPXString &s);
void append(const char *s); void append(const char *s);
void append(const char c); void append(const char c);
void clear(); void clear();
WPXString& operator=(const WPXString &str); WPXString &operator=(const WPXString &str);
WPXString& operator=(const char *s); WPXString &operator=(const char *s);
bool operator==(const char *s) const; bool operator==(const char *s) const;
bool operator==(const WPXString &str) const; bool operator==(const WPXString &str) const;
bool operator!() const; bool operator!() const;
inline bool operator!=(const char *s) const { return !operator==(s); inline bool operator!=(const char *s) const
} {
inline bool operator!=(const WPXString &str) const { return !operato return !operator==(s);
r==(str); } }
inline bool operator!=(const WPXString &str) const
{
return !operator==(str);
}
class Iter class Iter
{ {
public: public:
Iter(const WPXString &str); Iter(const WPXString &str);
virtual ~Iter(); virtual ~Iter();
void rewind(); void rewind();
bool next(); bool next();
bool last(); bool last();
const char * operator()() const; const char *operator()() const;
private: private:
Iter(const Iter&); Iter(const Iter &);
Iter& operator=(const Iter&); Iter &operator=(const Iter &);
WPXStringImpl *m_stringImpl; WPXStringImpl *m_stringImpl;
int m_pos; int m_pos;
mutable char *m_curChar; mutable char *m_curChar;
}; };
private: private:
WPXStringImpl *m_stringImpl; WPXStringImpl *m_stringImpl;
}; };
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 7 change blocks. 
11 lines changed or deleted 16 lines changed or added


 libwpd-stream.h   libwpd-stream.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2007 Fridrich Strba (fridrich.strba@bluewin.ch) * Copyright (C) 2007 Fridrich Strba (fridrich.strba@bluewin.ch)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 30 skipping to change at line 31
/* "This product is not manufactured, approved, or supported by /* "This product is not manufactured, approved, or supported by
* Corel Corporation or Corel Corporation Limited." * Corel Corporation or Corel Corporation Limited."
*/ */
#ifndef LIBWPD_STREAM_H #ifndef LIBWPD_STREAM_H
#define LIBWPD_STREAM_H #define LIBWPD_STREAM_H
#define LIBWPD_STREAM_VERSION_MAJOR 0 #define LIBWPD_STREAM_VERSION_MAJOR 0
#define LIBWPD_STREAM_VERSION_MINOR 9 #define LIBWPD_STREAM_VERSION_MINOR 9
#define LIBWPD_STREAM_VERSION_REVISION 3 #define LIBWPD_STREAM_VERSION_REVISION 4
#define LIBWPD_STREAM_VERSION_STRING "0.9.3" #define LIBWPD_STREAM_VERSION_STRING "0.9.4"
#include "WPXStream.h" #include "WPXStream.h"
#include "WPXStreamImplementation.h" #include "WPXStreamImplementation.h"
#endif /* LIBWPD_STREAM_H */ #endif /* LIBWPD_STREAM_H */
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 3 change blocks. 
2 lines changed or deleted 3 lines changed or added


 libwpd.h   libwpd.h 
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* libwpd /* libwpd
* Copyright (C) 2002 William Lachance (wrlach@gmail.com) * Copyright (C) 2002 William Lachance (wrlach@gmail.com)
* Copyright (C) 2002 Marc Maurer (uwog@uwog.net) * Copyright (C) 2002 Marc Maurer (uwog@uwog.net)
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
skipping to change at line 31 skipping to change at line 32
/* "This product is not manufactured, approved, or supported by /* "This product is not manufactured, approved, or supported by
* Corel Corporation or Corel Corporation Limited." * Corel Corporation or Corel Corporation Limited."
*/ */
#ifndef LIBWPD_H #ifndef LIBWPD_H
#define LIBWPD_H #define LIBWPD_H
#define LIBWPD_VERSION_MAJOR 0 #define LIBWPD_VERSION_MAJOR 0
#define LIBWPD_VERSION_MINOR 9 #define LIBWPD_VERSION_MINOR 9
#define LIBWPD_VERSION_REVISION 3 #define LIBWPD_VERSION_REVISION 4
#define LIBWPD_VERSION_STRING "0.9.3" #define LIBWPD_VERSION_STRING "0.9.4"
#include "WPXDocumentInterface.h" #include "WPXDocumentInterface.h"
#include "WPDocument.h" #include "WPDocument.h"
#endif /* LIBWPD_H */ #endif /* LIBWPD_H */
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
 End of changes. 3 change blocks. 
2 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/