File libodfgen-0.1.0-cumulative.patch of Package mingw32-libodfgen

Overview Repositories Revisions Requests Users Attributes Meta

File libodfgen-0.1.0-cumulative.patch of Package mingw32-libodfgen (Revision eea11c85c9fe4a86382fde336df2e467)

Currently displaying revision eea11c85c9fe4a86382fde336df2e467 , Show latest

--- a/inc/libodfgen/Makefile.am
+++ b/inc/libodfgen/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 	libodfgen.hxx \
+	libodfgen-api.hxx \
 	OdfDocumentHandler.hxx \
 	OdgGenerator.hxx \
 	OdsGenerator.hxx \
--- a/inc/libodfgen/OdfDocumentHandler.hxx
+++ b/inc/libodfgen/OdfDocumentHandler.hxx
@@ -26,6 +26,8 @@
 #define _ODFDOCUMENTHANDLER_HXX_
 #include <librevenge/librevenge.h>
 
+#include "libodfgen-api.hxx"
+
 /** Type of ODF content a generator should produce.
   *
   * @sa OdgGenerator, OdpGenerator, OdtGenerator
@@ -57,7 +59,7 @@ typedef bool (*OdfEmbeddedImage)(const librevenge::RVNGBinaryData &input, librev
   * saved to a file, printed to the standard output, saved to a file
   * inside a package, or whatever else.
   */
-class OdfDocumentHandler
+class ODFGENAPI OdfDocumentHandler
 {
 public:
 	virtual ~OdfDocumentHandler() {}
--- a/inc/libodfgen/OdgGenerator.hxx
+++ b/inc/libodfgen/OdgGenerator.hxx
@@ -27,6 +27,7 @@
 
 #include <librevenge/librevenge.h>
 
+#include "libodfgen-api.hxx"
 #include "OdfDocumentHandler.hxx"
 
 class OdfGenerator;
@@ -37,7 +38,7 @@ class OdgGeneratorPrivate;
   * See @c librevenge library for documentation of the
   * librevenge::WPGPaintInterface interface.
   */
-class OdgGenerator : public librevenge::RVNGDrawingInterface
+class ODFGENAPI OdgGenerator : public librevenge::RVNGDrawingInterface
 {
 public:
 	OdgGenerator();
--- a/inc/libodfgen/OdpGenerator.hxx
+++ b/inc/libodfgen/OdpGenerator.hxx
@@ -27,6 +27,7 @@
 
 #include <librevenge/librevenge.h>
 
+#include "libodfgen-api.hxx"
 #include "OdfDocumentHandler.hxx"
 
 class OdfGenerator;
@@ -37,7 +38,7 @@ class OdpGeneratorPrivate;
   * See @c librevenge library for documentation of the
   * librevenge::KEYPresentationInterface interface.
   */
-class OdpGenerator : public librevenge::RVNGPresentationInterface
+class ODFGENAPI OdpGenerator : public librevenge::RVNGPresentationInterface
 {
 public:
 	OdpGenerator();
--- a/inc/libodfgen/OdsGenerator.hxx
+++ b/inc/libodfgen/OdsGenerator.hxx
@@ -29,6 +29,7 @@
 
 #include <librevenge/librevenge.h>
 
+#include "libodfgen-api.hxx"
 #include "OdfDocumentHandler.hxx"
 
 class OdfGenerator;
@@ -39,7 +40,7 @@ class OdsGeneratorPrivate;
   * See @c libdocumentinterface library for documentation of the librevenge::RVNGSpreadsheetInterface
   * interface.
   */
-class OdsGenerator : public librevenge::RVNGSpreadsheetInterface
+class ODFGENAPI OdsGenerator : public librevenge::RVNGSpreadsheetInterface
 {
 public:
 	OdsGenerator();
--- a/inc/libodfgen/OdtGenerator.hxx
+++ b/inc/libodfgen/OdtGenerator.hxx
@@ -29,6 +29,7 @@
 
 #include <librevenge/librevenge.h>
 
+#include "libodfgen-api.hxx"
 #include "OdfDocumentHandler.hxx"
 
 class OdtGeneratorPrivate;
@@ -39,7 +40,7 @@ class OdfGenerator;
   * See @c librevenge library for documentation of the ::librevenge::RVNGTextInterface
   * interface.
   */
-class OdtGenerator : public librevenge::RVNGTextInterface
+class ODFGENAPI OdtGenerator : public librevenge::RVNGTextInterface
 {
 public:
 	OdtGenerator();
--- /dev/null
+++ b/inc/libodfgen/libodfgen-api.hxx
@@ -0,0 +1,38 @@
+/* -*- 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 <fridrich.strba@bluewin.ch>
+ * Copyright (C) 2011 Eilidh McAdam <tibbylickle@gmail.com>
+ *
+ * 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 INCLUDED_LIBODFGEN_LIBODFGEN_API_HXX
+#define INCLUDED_LIBODFGEN_LIBODFGEN_API_HXX
+
+#ifdef DLL_EXPORT
+#ifdef LIBODFGEN_BUILD
+#define ODFGENAPI __declspec(dllexport)
+#else
+#define ODFGENAPI __declspec(dllimport)
+#endif
+#else
+#define ODFGENAPI
+#endif
+
+#endif // INCLUDED_LIBODFGEN_LIBODFGEN_API_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,9 +15,10 @@ libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_include_HEADERS =
 	$(top_srcdir)/inc/libodfgen/OdpGenerator.hxx \
 	$(top_srcdir)/inc/libodfgen/OdsGenerator.hxx \
 	$(top_srcdir)/inc/libodfgen/OdtGenerator.hxx \
-	$(top_srcdir)/inc/libodfgen/libodfgen.hxx
+	$(top_srcdir)/inc/libodfgen/libodfgen.hxx \
+	$(top_srcdir)/inc/libodfgen/libodfgen-api.hxx
 
-AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBODFGEN_BUILD
 
 libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS)
 libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES = @LIBODFGEN_WIN32_RESOURCE@
--- a/src/SheetStyle.cxx
+++ b/src/SheetStyle.cxx
@@ -550,7 +550,7 @@ librevenge::RVNGString SheetManager::convertFormula(const librevenge::RVNGProper
 		librevenge::RVNGPropertyList const &list=formula[i];
 		if (!list["librevenge:type"])
 		{
-			ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find %d formula type !!!\n", int(s)));
+			ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find %s formula type !!!\n", s.str().c_str()));
 			return res;
 		}
 		std::string type(list["librevenge:type"]->getStr().cstr());
@@ -558,7 +558,7 @@ librevenge::RVNGString SheetManager::convertFormula(const librevenge::RVNGProper
 		{
 			if (!list["librevenge:operator"])
 			{
-				ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find operator for formula[%d]!!!\n", int(s)));
+				ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find operator for formula[%s]!!!\n", s.str().c_str()));
 				return res;
 			}
 			std::string oper(list["librevenge:operator"]->getStr().cstr());
@@ -576,7 +576,7 @@ librevenge::RVNGString SheetManager::convertFormula(const librevenge::RVNGProper
 			}
 			if (!find)
 			{
-				ODFGEN_DEBUG_MSG(("SheetManager::addFormula find unknown operator for formula[%d]!!!\n", int(s)));
+				ODFGEN_DEBUG_MSG(("SheetManager::addFormula find unknown operator for formula[%s]!!!\n", s.str().c_str()));
 				return res;
 			}
 		}
@@ -584,7 +584,7 @@ librevenge::RVNGString SheetManager::convertFormula(const librevenge::RVNGProper
 		{
 			if (!list["librevenge:function"])
 			{
-				ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find value for formula[%d]!!!\n", int(s)));
+				ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find value for formula[%s]!!!\n", s.str().c_str()));
 				return res;
 			}
 			s << list["librevenge:function"]->getStr().cstr();
@@ -593,7 +593,7 @@ librevenge::RVNGString SheetManager::convertFormula(const librevenge::RVNGProper
 		{
 			if (!list["librevenge:number"])
 			{
-				ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find value for formula[%d]!!!\n", int(s)));
+				ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find value for formula[%s]!!!\n", s.str().c_str()));
 				return res;
 			}
 			s << list["librevenge:number"]->getStr().cstr();
@@ -602,7 +602,7 @@ librevenge::RVNGString SheetManager::convertFormula(const librevenge::RVNGProper
 		{
 			if (!list["librevenge:text"])
 			{
-				ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find text for formula[%d]!!!\n", int(s)));
+				ODFGEN_DEBUG_MSG(("SheetManager::addFormula can not find text for formula[%s]!!!\n", s.str().c_str()));
 				return res;
 			}
 			librevenge::RVNGString escaped;

Places

File libodfgen-0.1.0-cumulative.patch of Package mingw32-libodfgen (Revision eea11c85c9fe4a86382fde336df2e467)

Places