Hello community, here is the log from the commit of package libodfgen for openSUSE:Factory checked in at 2013-06-05 11:54:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libodfgen (Old) and /work/SRC/openSUSE:Factory/.libodfgen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libodfgen" Changes: -------- --- /work/SRC/openSUSE:Factory/libodfgen/libodfgen.changes 2013-05-16 11:08:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libodfgen.new/libodfgen.changes 2013-06-05 11:54:20.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 27 11:20:55 UTC 2013 - [email protected] + +- Upstream release 0.0.2 + * Cleanup of build system + * Source code layout change, so that the public headers + can be directly included from the tarball + * Improvements in generation of borders and column separators + +------------------------------------------------------------------- Old: ---- libodfgen-0.0.1.tar.xz New: ---- libodfgen-0.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libodfgen.spec ++++++ --- /var/tmp/diff_new_pack.LSSa2j/_old 2013-06-05 11:54:21.000000000 +0200 +++ /var/tmp/diff_new_pack.LSSa2j/_new 2013-06-05 11:54:21.000000000 +0200 @@ -24,7 +24,7 @@ BuildRequires: libwpg-devel BuildRequires: pkgconfig BuildRequires: xz -Version: 0.0.1 +Version: 0.0.2 Release: 0 Summary: Library to generate ODF documents from libwpd's and libwpg's api calls License: LGPL-2.1+ and MPL-2.0+ ++++++ libodfgen-0.0.1.tar.xz -> libodfgen-0.0.2.tar.xz ++++++ ++++ 2053 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/ChangeLog new/libodfgen-0.0.2/ChangeLog --- old/libodfgen-0.0.1/ChangeLog 2013-05-07 13:29:35.000000000 +0200 +++ new/libodfgen-0.0.2/ChangeLog 2013-05-22 11:24:55.000000000 +0200 @@ -1,3 +1,20 @@ +2013-05-22 Fridrich Štrba <[email protected]> [da4b4ba96d56f5557dc70d81443ef380c4e11fd2] + + Bump version + + +2013-05-15 Laurent Alonso <[email protected]> [4b6cd1ea149648f710a0bab3b213e308953cda1d] + + Border and column separator changes + + Allow to define border sizes independently + Allow to specify separator lines between colums + +2013-05-10 Fridrich Štrba <[email protected]> [c192984d25ebbd287d8eea97eccfc630a57d5e26] + + Make Michael Stahl happy (one library at the time) + + 2013-05-07 Fridrich Štrba <[email protected]> [1a2206c74bb416fc708ab519f453fd3d7002d441] A bit more of automatism in pc file generation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/Makefile.am new/libodfgen-0.0.2/Makefile.am --- old/libodfgen-0.0.1/Makefile.am 2013-05-07 11:16:35.000000000 +0200 +++ new/libodfgen-0.0.2/Makefile.am 2013-05-10 14:07:44.000000000 +0200 @@ -4,7 +4,7 @@ -SUBDIRS = build src +SUBDIRS = build inc src pkgconf_DATA = libodfgen-@LIBODFGEN_MAJOR_VERSION@.@[email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/build/win32/libodfgen.dsp new/libodfgen-0.0.2/build/win32/libodfgen.dsp --- old/libodfgen-0.0.1/build/win32/libodfgen.dsp 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/build/win32/libodfgen.dsp 2013-05-10 14:10:28.000000000 +0200 @@ -145,7 +145,7 @@ # End Source File # Begin Source File -SOURCE=..\..\src\libodfgen.hxx +SOURCE=..\..\inc\libodfgen\libodfgen.hxx # End Source File # Begin Source File @@ -153,15 +153,15 @@ # End Source File # Begin Source File -SOURCE=..\..\src\OdfDocumentHandler.hxx +SOURCE=..\..\inc\libodfgen\OdfDocumentHandler.hxx # End Source File # Begin Source File -SOURCE=..\..\src\OdgGenerator.hxx +SOURCE=..\..\inc\libodfgen\OdgGenerator.hxx # End Source File # Begin Source File -SOURCE=..\..\src\OdtGenerator.hxx +SOURCE=..\..\inc\libodfgen\OdtGenerator.hxx # End Source File # Begin Source File diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/configure.ac new/libodfgen-0.0.2/configure.ac --- old/libodfgen-0.0.1/configure.ac 2013-05-07 13:28:53.000000000 +0200 +++ new/libodfgen-0.0.2/configure.ac 2013-05-22 11:23:28.000000000 +0200 @@ -7,7 +7,7 @@ # ==================== m4_define([libodfgen_version_major],[0]) m4_define([libodfgen_version_minor],[0]) -m4_define([libodfgen_version_micro],[1]) +m4_define([libodfgen_version_micro],[2]) m4_define([libodfgen_version],[libodfgen_version_major.libodfgen_version_minor.libodfgen_version_micro]) # ============= @@ -249,6 +249,8 @@ Makefile build/Makefile build/win32/Makefile +inc/Makefile +inc/libodfgen/Makefile src/Makefile src/libodfgen.rc ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/inc/Makefile.am new/libodfgen-0.0.2/inc/Makefile.am --- old/libodfgen-0.0.1/inc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/libodfgen-0.0.2/inc/Makefile.am 2013-05-10 14:08:26.000000000 +0200 @@ -0,0 +1,2 @@ +SUBDIRS = libodfgen + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/inc/libodfgen/Makefile.am new/libodfgen-0.0.2/inc/libodfgen/Makefile.am --- old/libodfgen-0.0.1/inc/libodfgen/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/libodfgen-0.0.2/inc/libodfgen/Makefile.am 2013-05-10 14:03:15.000000000 +0200 @@ -0,0 +1,5 @@ +EXTRA_DIST = \ + libodfgen.hxx \ + OdfDocumentHandler.hxx \ + OdgGenerator.hxx \ + OdtGenerator.hxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/inc/libodfgen/OdfDocumentHandler.hxx new/libodfgen-0.0.2/inc/libodfgen/OdfDocumentHandler.hxx --- old/libodfgen-0.0.1/inc/libodfgen/OdfDocumentHandler.hxx 1970-01-01 01:00:00.000000000 +0100 +++ new/libodfgen-0.0.2/inc/libodfgen/OdfDocumentHandler.hxx 2013-05-02 06:58:53.000000000 +0200 @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* libodfgen + * Version: MPL 2.0 / LGPLv2.1+ + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Major Contributor(s): + * Copyright (C) 2004 William Lachance ([email protected]) + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms + * of the GNU Lesser General Public License Version 2.1 or later + * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are + * applicable instead of those above. + * + * For further information visit http://libwpd.sourceforge.net + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ +#ifndef _ODFDOCUMENTHANDLER_HXX_ +#define _ODFDOCUMENTHANDLER_HXX_ +#include <libwpd/libwpd.h> + +enum OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML }; + +class OdfDocumentHandler +{ +public: + OdfDocumentHandler() {}; + virtual ~OdfDocumentHandler() {}; + + virtual void startDocument() = 0; + virtual void endDocument() = 0; + virtual void startElement(const char *psName, const WPXPropertyList &xPropList) = 0; + virtual void endElement(const char *psName) = 0; + virtual void characters(const WPXString &sCharacters) = 0; +}; +#endif + +/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/inc/libodfgen/OdgGenerator.hxx new/libodfgen-0.0.2/inc/libodfgen/OdgGenerator.hxx --- old/libodfgen-0.0.1/inc/libodfgen/OdgGenerator.hxx 1970-01-01 01:00:00.000000000 +0100 +++ new/libodfgen-0.0.2/inc/libodfgen/OdgGenerator.hxx 2013-05-02 06:58:53.000000000 +0200 @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* libodfgen + * Version: MPL 2.0 / LGPLv2.1+ + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Major Contributor(s): + * Copyright (C) 2006 Ariya Hidayat ([email protected]) + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms + * of the GNU Lesser General Public License Version 2.1 or later + * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are + * applicable instead of those above. + * + * For further information visit http://libwpd.sourceforge.net + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ +#ifndef __ODGGENERATOR_HXX__ +#define __ODGGENERATOR_HXX__ + +#include <libwpd/libwpd.h> +#include <libwpg/libwpg.h> + +#include "OdfDocumentHandler.hxx" + +class OdgGeneratorPrivate; + +class OdgGenerator : public libwpg::WPGPaintInterface +{ +public: + OdgGenerator(OdfDocumentHandler *pHandler, const OdfStreamType streamType); + ~OdgGenerator(); + + void startGraphics(const ::WPXPropertyList &propList); + void endGraphics(); + void startLayer(const ::WPXPropertyList &propList); + void endLayer(); + void startEmbeddedGraphics(const ::WPXPropertyList &propList); + void endEmbeddedGraphics(); + + void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); + + void drawRectangle(const ::WPXPropertyList &propList); + void drawEllipse(const ::WPXPropertyList &propList); + void drawPolyline(const ::WPXPropertyListVector &vertices); + void drawPolygon(const ::WPXPropertyListVector &vertices); + void drawPath(const ::WPXPropertyListVector &path); + void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); + + void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); + void endTextObject(); + void startTextLine(const ::WPXPropertyList &propList); + void endTextLine(); + void startTextSpan(const ::WPXPropertyList &propList); + void endTextSpan(); + void insertText(const ::WPXString &str); + +private: + OdgGenerator(OdgGenerator const &); + OdgGenerator &operator=(OdgGenerator const &); + + OdgGeneratorPrivate *mpImpl; +}; + +#endif // __ODGGENERATOR_HXX__ + +/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/inc/libodfgen/OdtGenerator.hxx new/libodfgen-0.0.2/inc/libodfgen/OdtGenerator.hxx --- old/libodfgen-0.0.1/inc/libodfgen/OdtGenerator.hxx 1970-01-01 01:00:00.000000000 +0100 +++ new/libodfgen-0.0.2/inc/libodfgen/OdtGenerator.hxx 2013-05-02 06:58:53.000000000 +0200 @@ -0,0 +1,122 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* libodfgen + * Version: MPL 2.0 / LGPLv2.1+ + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Major Contributor(s): + * Copyright (C) 2002-2004 William Lachance ([email protected]) + * Copyright (C) 2004 Fridrich Strba ([email protected]) + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms + * of the GNU Lesser General Public License Version 2.1 or later + * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are + * applicable instead of those above. + * + * For further information visit http://libwpd.sourceforge.net + */ + +/* "This product is not manufactured, approved, or supported by + * Corel Corporation or Corel Corporation Limited." + */ + +#ifndef _ODTGENERATOR_HXX_ +#define _ODTGENERATOR_HXX_ + +#include <libwpd/libwpd.h> + +#include "OdfDocumentHandler.hxx" + + +typedef bool (*OdfEmbeddedObject)(const WPXBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType); +typedef bool (*OdfEmbeddedImage)(const WPXBinaryData &input, WPXBinaryData &output); + +class OdtGeneratorPrivate; + +class OdtGenerator : public WPXDocumentInterface +{ +public: + OdtGenerator(OdfDocumentHandler *pHandler, const OdfStreamType streamType); + ~OdtGenerator(); + + // WPXDocumentInterface's implementation + void setDocumentMetaData(const WPXPropertyList &propList); + void startDocument(); + void endDocument(); + + void definePageStyle(const WPXPropertyList &); + void openPageSpan(const WPXPropertyList &propList); + void closePageSpan(); + + void defineSectionStyle(const WPXPropertyList &, const WPXPropertyListVector &); + void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns); + void closeSection(); + + void openHeader(const WPXPropertyList &propList); + void closeHeader(); + void openFooter(const WPXPropertyList &propList); + void closeFooter(); + + void defineParagraphStyle(const WPXPropertyList &, const WPXPropertyListVector &); + void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); + void closeParagraph(); + + void defineCharacterStyle(const WPXPropertyList &); + void openSpan(const WPXPropertyList &propList); + void closeSpan(); + + void insertTab(); + void insertSpace(); + void insertText(const WPXString &text); + void insertLineBreak(); + void insertField(const WPXString &type, const WPXPropertyList &propList); + + void defineOrderedListLevel(const WPXPropertyList &propList); + void defineUnorderedListLevel(const WPXPropertyList &propList); + void openOrderedListLevel(const WPXPropertyList &propList); + void openUnorderedListLevel(const WPXPropertyList &propList); + void closeOrderedListLevel(); + void closeUnorderedListLevel(); + void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); + void closeListElement(); + + void openFootnote(const WPXPropertyList &propList); + void closeFootnote(); + void openEndnote(const WPXPropertyList &propList); + void closeEndnote(); + void openComment(const WPXPropertyList &propList); + void closeComment(); + void openTextBox(const WPXPropertyList &propList); + void closeTextBox(); + + void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns); + void openTableRow(const WPXPropertyList &propList); + void closeTableRow(); + void openTableCell(const WPXPropertyList &propList); + void closeTableCell(); + void insertCoveredTableCell(const WPXPropertyList &propList); + void closeTable(); + + void openFrame(const WPXPropertyList &propList); + void closeFrame(); + + void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data); + void insertEquation(const WPXPropertyList &propList, const WPXString &data); + + // Register special converter for certain embedded binary objects + void registerEmbeddedObjectHandler(const WPXString &mimeType, OdfEmbeddedObject objectHandler); + void registerEmbeddedImageHandler(const WPXString &mimeType, OdfEmbeddedImage imageHandler); + +private: + OdtGenerator(OdtGenerator const &); + OdtGenerator &operator=(OdtGenerator const &); + + OdtGeneratorPrivate *mpImpl; +}; +#endif + +/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/inc/libodfgen/libodfgen.hxx new/libodfgen-0.0.2/inc/libodfgen/libodfgen.hxx --- old/libodfgen-0.0.1/inc/libodfgen/libodfgen.hxx 1970-01-01 01:00:00.000000000 +0100 +++ new/libodfgen-0.0.2/inc/libodfgen/libodfgen.hxx 2013-05-02 06:58:53.000000000 +0200 @@ -0,0 +1,34 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* libodfgen + * Version: MPL 2.0 / LGPLv2.1+ + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Major Contributor(s): + * Copyright (C) 2013 Fridrich Strba <[email protected]> + * Copyright (C) 2011 Eilidh McAdam <[email protected]> + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms + * of the GNU Lesser General Public License Version 2.1 or later + * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are + * applicable instead of those above. + * + * For further information visit http://libwpd.sourceforge.net + */ + +#ifndef __LIBODFGEN_HXX__ +#define __LIBODFGEN_HXX__ + +#include <libwpd/libwpd.h> +#include <libwpg/libwpg.h> +#include "OdfDocumentHandler.hxx" +#include "OdtGenerator.hxx" +#include "OdgGenerator.hxx" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/DocumentElement.cxx new/libodfgen-0.0.2/src/DocumentElement.cxx --- old/libodfgen-0.0.1/src/DocumentElement.cxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/DocumentElement.cxx 2013-05-10 14:04:54.000000000 +0200 @@ -24,7 +24,6 @@ */ #include "DocumentElement.hxx" -#include "OdfDocumentHandler.hxx" #include "FilterInternal.hxx" #include <string.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/DocumentElement.hxx new/libodfgen-0.0.2/src/DocumentElement.hxx --- old/libodfgen-0.0.1/src/DocumentElement.hxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/DocumentElement.hxx 2013-05-10 14:04:31.000000000 +0200 @@ -31,7 +31,7 @@ #include <libwpd/WPXString.h> #include <vector> -#include "OdfDocumentHandler.hxx" +#include <libodfgen/libodfgen.hxx> class DocumentElement { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/InternalHandler.hxx new/libodfgen-0.0.2/src/InternalHandler.hxx --- old/libodfgen-0.0.1/src/InternalHandler.hxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/InternalHandler.hxx 2013-05-10 14:05:34.000000000 +0200 @@ -29,8 +29,8 @@ #include <libwpd/libwpd.h> #include <libwpd/WPXProperty.h> #include <libwpd/WPXString.h> +#include <libodfgen/libodfgen.hxx> #include "DocumentElement.hxx" -#include "OdfDocumentHandler.hxx" class InternalHandler : public OdfDocumentHandler { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/Makefile.am new/libodfgen-0.0.2/src/Makefile.am --- old/libodfgen-0.0.1/src/Makefile.am 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/Makefile.am 2013-05-10 14:00:12.000000000 +0200 @@ -10,12 +10,12 @@ $(includedir)/libodfgen-@LIBODFGEN_MAJOR_VERSION@.@LIBODFGEN_MINOR_VERSION@/libodfgen libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_include_HEADERS = \ - OdfDocumentHandler.hxx \ - OdtGenerator.hxx \ - OdgGenerator.hxx \ - libodfgen.hxx + $(top_srcdir)/inc/libodfgen/OdfDocumentHandler.hxx \ + $(top_srcdir)/inc/libodfgen/OdtGenerator.hxx \ + $(top_srcdir)/inc/libodfgen/OdgGenerator.hxx \ + $(top_srcdir)/inc/libodfgen/libodfgen.hxx -AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS) libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(WPD_LIBS) libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES = @LIBODFGEN_WIN32_RESOURCE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/OdfDocumentHandler.hxx new/libodfgen-0.0.2/src/OdfDocumentHandler.hxx --- old/libodfgen-0.0.1/src/OdfDocumentHandler.hxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/OdfDocumentHandler.hxx 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* libodfgen - * Version: MPL 2.0 / LGPLv2.1+ - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Major Contributor(s): - * Copyright (C) 2004 William Lachance ([email protected]) - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms - * of the GNU Lesser General Public License Version 2.1 or later - * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are - * applicable instead of those above. - * - * For further information visit http://libwpd.sourceforge.net - */ - -/* "This product is not manufactured, approved, or supported by - * Corel Corporation or Corel Corporation Limited." - */ -#ifndef _ODFDOCUMENTHANDLER_HXX_ -#define _ODFDOCUMENTHANDLER_HXX_ -#include <libwpd/libwpd.h> - -enum OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML }; - -class OdfDocumentHandler -{ -public: - OdfDocumentHandler() {}; - virtual ~OdfDocumentHandler() {}; - - virtual void startDocument() = 0; - virtual void endDocument() = 0; - virtual void startElement(const char *psName, const WPXPropertyList &xPropList) = 0; - virtual void endElement(const char *psName) = 0; - virtual void characters(const WPXString &sCharacters) = 0; -}; -#endif - -/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/OdgGenerator.cxx new/libodfgen-0.0.2/src/OdgGenerator.cxx --- old/libodfgen-0.0.1/src/OdgGenerator.cxx 2013-05-07 10:23:47.000000000 +0200 +++ new/libodfgen-0.0.2/src/OdgGenerator.cxx 2013-05-10 14:07:06.000000000 +0200 @@ -24,11 +24,10 @@ * Corel Corporation or Corel Corporation Limited." */ -#include "FilterInternal.hxx" +#include <libodfgen/libodfgen.hxx> -#include "OdgGenerator.hxx" +#include "FilterInternal.hxx" #include "DocumentElement.hxx" -#include "OdfDocumentHandler.hxx" #include "TextRunStyle.hxx" #include "FontStyle.hxx" #include <locale.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/OdgGenerator.hxx new/libodfgen-0.0.2/src/OdgGenerator.hxx --- old/libodfgen-0.0.1/src/OdgGenerator.hxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/OdgGenerator.hxx 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* libodfgen - * Version: MPL 2.0 / LGPLv2.1+ - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Major Contributor(s): - * Copyright (C) 2006 Ariya Hidayat ([email protected]) - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms - * of the GNU Lesser General Public License Version 2.1 or later - * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are - * applicable instead of those above. - * - * For further information visit http://libwpd.sourceforge.net - */ - -/* "This product is not manufactured, approved, or supported by - * Corel Corporation or Corel Corporation Limited." - */ -#ifndef __ODGGENERATOR_HXX__ -#define __ODGGENERATOR_HXX__ - -#include <libwpd/libwpd.h> -#include <libwpg/libwpg.h> - -#include "OdfDocumentHandler.hxx" - -class OdgGeneratorPrivate; - -class OdgGenerator : public libwpg::WPGPaintInterface -{ -public: - OdgGenerator(OdfDocumentHandler *pHandler, const OdfStreamType streamType); - ~OdgGenerator(); - - void startGraphics(const ::WPXPropertyList &propList); - void endGraphics(); - void startLayer(const ::WPXPropertyList &propList); - void endLayer(); - void startEmbeddedGraphics(const ::WPXPropertyList &propList); - void endEmbeddedGraphics(); - - void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); - - void drawRectangle(const ::WPXPropertyList &propList); - void drawEllipse(const ::WPXPropertyList &propList); - void drawPolyline(const ::WPXPropertyListVector &vertices); - void drawPolygon(const ::WPXPropertyListVector &vertices); - void drawPath(const ::WPXPropertyListVector &path); - void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); - - void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); - void endTextObject(); - void startTextLine(const ::WPXPropertyList &propList); - void endTextLine(); - void startTextSpan(const ::WPXPropertyList &propList); - void endTextSpan(); - void insertText(const ::WPXString &str); - -private: - OdgGenerator(OdgGenerator const &); - OdgGenerator &operator=(OdgGenerator const &); - - OdgGeneratorPrivate *mpImpl; -}; - -#endif // __ODGGENERATOR_HXX__ - -/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/OdtGenerator.cxx new/libodfgen-0.0.2/src/OdtGenerator.cxx --- old/libodfgen-0.0.1/src/OdtGenerator.cxx 2013-05-02 21:15:30.000000000 +0200 +++ new/libodfgen-0.0.2/src/OdtGenerator.cxx 2013-05-15 09:26:59.000000000 +0200 @@ -30,7 +30,8 @@ #include <stack> #include <string> -#include "OdtGenerator.hxx" +#include <libodfgen/libodfgen.hxx> + #include "DocumentElement.hxx" #include "TextRunStyle.hxx" #include "FontStyle.hxx" @@ -1318,14 +1319,16 @@ // check if the frame has border, background attributes static char const *(bordersString[])= - {"fo:border","fo:border-top","fo:border-left","fo:border-bottom","fo:border-right"}; - for (int b = 0; b < 5; b++) + { + "fo:border","fo:border-top","fo:border-left","fo:border-bottom","fo:border-right", + "style:border-line-width","style:border-line-width-top","style:border-line-width-left", + "style:border-line-width-bottom","style:border-line-width-right" + }; + for (int b = 0; b < 10; b++) { if (propList[bordersString[b]]) frameAutomaticStylePropertiesElement->addAttribute(bordersString[b], propList[bordersString[b]]->getStr()); } - if (propList["style:border-line-width"]) - frameAutomaticStylePropertiesElement->addAttribute("style:border-line-width", propList["style:border-line-width"]->getStr()); if (propList["fo:background-color"]) frameAutomaticStylePropertiesElement->addAttribute("fo:background-color", propList["fo:background-color"]->getStr()); if (propList["style:background-transparency"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/OdtGenerator.hxx new/libodfgen-0.0.2/src/OdtGenerator.hxx --- old/libodfgen-0.0.1/src/OdtGenerator.hxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/OdtGenerator.hxx 1970-01-01 01:00:00.000000000 +0100 @@ -1,122 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* libodfgen - * Version: MPL 2.0 / LGPLv2.1+ - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Major Contributor(s): - * Copyright (C) 2002-2004 William Lachance ([email protected]) - * Copyright (C) 2004 Fridrich Strba ([email protected]) - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms - * of the GNU Lesser General Public License Version 2.1 or later - * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are - * applicable instead of those above. - * - * For further information visit http://libwpd.sourceforge.net - */ - -/* "This product is not manufactured, approved, or supported by - * Corel Corporation or Corel Corporation Limited." - */ - -#ifndef _ODTGENERATOR_HXX_ -#define _ODTGENERATOR_HXX_ - -#include <libwpd/libwpd.h> - -#include "OdfDocumentHandler.hxx" - - -typedef bool (*OdfEmbeddedObject)(const WPXBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType); -typedef bool (*OdfEmbeddedImage)(const WPXBinaryData &input, WPXBinaryData &output); - -class OdtGeneratorPrivate; - -class OdtGenerator : public WPXDocumentInterface -{ -public: - OdtGenerator(OdfDocumentHandler *pHandler, const OdfStreamType streamType); - ~OdtGenerator(); - - // WPXDocumentInterface's implementation - void setDocumentMetaData(const WPXPropertyList &propList); - void startDocument(); - void endDocument(); - - void definePageStyle(const WPXPropertyList &); - void openPageSpan(const WPXPropertyList &propList); - void closePageSpan(); - - void defineSectionStyle(const WPXPropertyList &, const WPXPropertyListVector &); - void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns); - void closeSection(); - - void openHeader(const WPXPropertyList &propList); - void closeHeader(); - void openFooter(const WPXPropertyList &propList); - void closeFooter(); - - void defineParagraphStyle(const WPXPropertyList &, const WPXPropertyListVector &); - void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); - void closeParagraph(); - - void defineCharacterStyle(const WPXPropertyList &); - void openSpan(const WPXPropertyList &propList); - void closeSpan(); - - void insertTab(); - void insertSpace(); - void insertText(const WPXString &text); - void insertLineBreak(); - void insertField(const WPXString &type, const WPXPropertyList &propList); - - void defineOrderedListLevel(const WPXPropertyList &propList); - void defineUnorderedListLevel(const WPXPropertyList &propList); - void openOrderedListLevel(const WPXPropertyList &propList); - void openUnorderedListLevel(const WPXPropertyList &propList); - void closeOrderedListLevel(); - void closeUnorderedListLevel(); - void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); - void closeListElement(); - - void openFootnote(const WPXPropertyList &propList); - void closeFootnote(); - void openEndnote(const WPXPropertyList &propList); - void closeEndnote(); - void openComment(const WPXPropertyList &propList); - void closeComment(); - void openTextBox(const WPXPropertyList &propList); - void closeTextBox(); - - void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns); - void openTableRow(const WPXPropertyList &propList); - void closeTableRow(); - void openTableCell(const WPXPropertyList &propList); - void closeTableCell(); - void insertCoveredTableCell(const WPXPropertyList &propList); - void closeTable(); - - void openFrame(const WPXPropertyList &propList); - void closeFrame(); - - void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data); - void insertEquation(const WPXPropertyList &propList, const WPXString &data); - - // Register special converter for certain embedded binary objects - void registerEmbeddedObjectHandler(const WPXString &mimeType, OdfEmbeddedObject objectHandler); - void registerEmbeddedImageHandler(const WPXString &mimeType, OdfEmbeddedImage imageHandler); - -private: - OdtGenerator(OdtGenerator const &); - OdtGenerator &operator=(OdtGenerator const &); - - OdtGeneratorPrivate *mpImpl; -}; -#endif - -/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/SectionStyle.cxx new/libodfgen-0.0.2/src/SectionStyle.cxx --- old/libodfgen-0.0.1/src/SectionStyle.cxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/SectionStyle.cxx 2013-05-15 09:26:59.000000000 +0200 @@ -48,18 +48,41 @@ styleOpen.addAttribute("style:family", "section"); styleOpen.write(pHandler); - // if the number of columns is <= 1, we will never come here. This is only an additional check - // style properties - pHandler->startElement("style:section-properties", mPropList); + WPXPropertyList propList; + WPXPropertyList::Iter p(mPropList); + for (p.rewind(); p.next(); ) + { + if (strncmp(p.key(), "libwpd:", 7) != 0) + propList.insert(p.key(), p()->getStr()); + } + pHandler->startElement("style:section-properties", propList); // column properties WPXPropertyList columnProps; + // if the number of columns is <= 1, we will never come here. This is only an additional check + // style properties if (mColumns.count() > 1) { columnProps.insert("fo:column-count", (int)mColumns.count()); pHandler->startElement("style:columns", columnProps); + if (mPropList["libwpd:colsep-width"] && mPropList["libwpd:colsep-color"]) + { + WPXPropertyList columnSeparator; + columnSeparator.insert("style:width", mPropList["libwpd:colsep-width"]->getStr()); + columnSeparator.insert("style:color", mPropList["libwpd:colsep-color"]->getStr()); + if (mPropList["libwpd:colsep-height"]) + columnSeparator.insert("style:height", mPropList["libwpd:colsep-height"]->getStr()); + else + columnSeparator.insert("style:height", "100%"); + if (mPropList["libwpd:colsep-vertical-align"]) + columnSeparator.insert("style:vertical-align", mPropList["libwpd:colsep-vertical-align"]->getStr()); + else + columnSeparator.insert("style:vertical-align", "middle"); + pHandler->startElement("style:column-sep", columnSeparator); + pHandler->endElement("style:column-sep"); + } WPXPropertyListVector::Iter i(mColumns); for (i.rewind(); i.next();) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/TextRunStyle.cxx new/libodfgen-0.0.2/src/TextRunStyle.cxx --- old/libodfgen-0.0.1/src/TextRunStyle.cxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/TextRunStyle.cxx 2013-05-15 09:26:59.000000000 +0200 @@ -110,6 +110,15 @@ propList.insert("style:page-number", i()->getStr()); else if (strcmp(i.key(), "fo:background-color") == 0) propList.insert("fo:background-color", i()->getStr()); + else if (strncmp(i.key(), "style:border-line-width", 23) == 0) + { + if (strcmp(i.key(), "style:border-line-width") == 0 || + strcmp(i.key(), "style:border-line-width-left") == 0 || + strcmp(i.key(), "style:border-line-width-right") == 0 || + strcmp(i.key(), "style:border-line-width-top") == 0 || + strcmp(i.key(), "style:border-line-width-bottom") == 0) + propList.insert(i.key(), i()->getStr()); + } else if (strncmp(i.key(), "fo:border", 9) == 0) { if (strcmp(i.key(), "fo:border") == 0 || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libodfgen-0.0.1/src/libodfgen.hxx new/libodfgen-0.0.2/src/libodfgen.hxx --- old/libodfgen-0.0.1/src/libodfgen.hxx 2013-05-02 06:58:53.000000000 +0200 +++ new/libodfgen-0.0.2/src/libodfgen.hxx 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* libodfgen - * Version: MPL 2.0 / LGPLv2.1+ - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Major Contributor(s): - * Copyright (C) 2013 Fridrich Strba <[email protected]> - * Copyright (C) 2011 Eilidh McAdam <[email protected]> - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms - * of the GNU Lesser General Public License Version 2.1 or later - * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are - * applicable instead of those above. - * - * For further information visit http://libwpd.sourceforge.net - */ - -#ifndef __LIBODFGEN_HXX__ -#define __LIBODFGEN_HXX__ - -#include <libwpd/libwpd.h> -#include <libwpg/libwpg.h> -#include "OdfDocumentHandler.hxx" -#include "OdtGenerator.hxx" -#include "OdgGenerator.hxx" - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
