rebase all import libs

Change-Id: I9e1fc613816c943f4fb1033185e34e3acf317f1d
(cherry picked from commit 48c9d7ac7ccdad27067efe0d168e96ff48372631)

4 files changed, 55 insertions, 32 deletions

diff --git a/external/libodfgen/0001-properly-export-API-symbols.patch b/external/libodfgen/0001-properly-export-API-symbols.patch
index 3f488ebdc1d3..91799aa82007 100644
--- a/external/libodfgen/0001-properly-export-API-symbols.patch
+++ b/external/libodfgen/0001-properly-export-API-symbols.patch
@@ -21,14 +21,14 @@ index 79c387b..19e04e3 100644
 +++ b/inc/libodfgen/OdfDocumentHandler.hxx
 @@ -26,6 +26,8 @@
  #define _ODFDOCUMENTHANDLER_HXX_
- #include <libwpd/libwpd.h>
+ #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 WPXBinaryData &input, librev
+@@ -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.
    */
@@ -42,64 +42,85 @@ index f818e3e..24455d8 100644
 --- a/inc/libodfgen/OdgGenerator.hxx
 +++ b/inc/libodfgen/OdgGenerator.hxx
 @@ -27,6 +27,7 @@
- #include <libwpd/libwpd.h>
- #include <libwpg/libwpg.h>
+ 
+ #include <librevenge/librevenge.h>
  
 +#include "libodfgen-api.hxx"
  #include "OdfDocumentHandler.hxx"
  
- class OdgGeneratorPrivate;
+ class OdfGenerator;
 @@ -37,7 +38,7 @@ class OdgGeneratorPrivate;
-   * See @c libwpg library for documentation of the
-   * libwpg::WPGPaintInterface interface.
+   * See @c librevenge library for documentation of the
+   * librevenge::WPGPaintInterface interface.
    */
--class OdgGenerator : public libwpg::WPGPaintInterface
-+class ODFGENAPI OdgGenerator : public libwpg::WPGPaintInterface
+-class OdgGenerator : public librevenge::RVNGDrawingInterface
++class ODFGENAPI OdgGenerator : public librevenge::RVNGDrawingInterface
  {
  public:
- 	OdgGenerator(OdfDocumentHandler *pHandler, const OdfStreamType streamType);
+ 	OdgGenerator();
 diff --git a/inc/libodfgen/OdpGenerator.hxx b/inc/libodfgen/OdpGenerator.hxx
 index 71f2562..c61f5ad 100644
 --- a/inc/libodfgen/OdpGenerator.hxx
 +++ b/inc/libodfgen/OdpGenerator.hxx
 @@ -27,6 +27,7 @@
  
- #include <libetonyek/libetonyek.h>
+ #include <librevenge/librevenge.h>
  
 +#include "libodfgen-api.hxx"
  #include "OdfDocumentHandler.hxx"
  
- class OdpGeneratorPrivate;
+ class OdfGenerator;
 @@ -37,7 +38,7 @@ class OdpGeneratorPrivate;
-   * See @c libetonyek library for documentation of the
-   * libetonyek::KEYPresentationInterface interface.
+   * See @c librevenge library for documentation of the
+   * librevenge::KEYPresentationInterface interface.
+   */
+-class OdpGenerator : public librevenge::RVNGPresentationInterface
++class ODFGENAPI OdpGenerator : public librevenge::RVNGPresentationInterface
+ {
+ public:
+ 	OdpGenerator();
+diff --git a/inc/libodfgen/OdsGenerator.hxx b/inc/libodfgen/OdsGenerator.hxx
+index f88c207..09e1b18 100644
+--- 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 OdpGenerator : public libetonyek::KEYPresentationInterface
-+class ODFGENAPI OdpGenerator : public libetonyek::KEYPresentationInterface
+-class OdsGenerator : public librevenge::RVNGSpreadsheetInterface
++class ODFGENAPI OdsGenerator : public librevenge::RVNGSpreadsheetInterface
  {
  public:
- 	OdpGenerator(OdfDocumentHandler *pHandler, const OdfStreamType streamType);
+ 	OdsGenerator();
 diff --git a/inc/libodfgen/OdtGenerator.hxx b/inc/libodfgen/OdtGenerator.hxx
 index 9c3ff88..e11778c 100644
 --- a/inc/libodfgen/OdtGenerator.hxx
 +++ b/inc/libodfgen/OdtGenerator.hxx
 @@ -29,6 +29,7 @@
  
- #include <libwpd/libwpd.h>
+ #include <librevenge/librevenge.h>
  
 +#include "libodfgen-api.hxx"
  #include "OdfDocumentHandler.hxx"
  
- /** Handler for embedded objects.
+ class OdtGeneratorPrivate;
 @@ -39,7 +40,7 @@ class OdfGenerator;
-   * See @c libwpd library for documentation of the ::WPXDocumentInterface
+   * See @c librevenge library for documentation of the ::librevenge::RVNGTextInterface
    * interface.
    */
--class OdtGenerator : public WPXDocumentInterface
-+class ODFGENAPI OdtGenerator : public WPXDocumentInterface
+-class OdtGenerator : public librevenge::RVNGTextInterface
++class ODFGENAPI OdtGenerator : public librevenge::RVNGTextInterface
  {
  public:
- 	OdtGenerator(OdfDocumentHandler *pHandler, const OdfStreamType streamType);
+ 	OdtGenerator();
 diff --git a/inc/libodfgen/libodfgen-api.hxx b/inc/libodfgen/libodfgen-api.hxx
 new file mode 100644
 index 0000000..39ffd05
diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk
index a0692eda1e36..5ae18399e494 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libodfgen,libodfgen))
 $(eval $(call gb_ExternalPackage_use_external_project,libodfgen,libodfgen))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.0.0.dylib,src/.libs/libodfgen-0.0.dylib))
+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.1.dylib,src/.libs/libodfgen-0.1.dylib))
 else ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.0.dll,src/.libs/libodfgen-0.0.dll))
+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.0.so.0,src/.libs/libodfgen-0.0.so.0.0.4))
+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index ab430df45e04..f4e007206897 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -17,9 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libodfgen,\
 
 $(eval $(call gb_ExternalProject_use_externals,libodfgen,\
 	boost_headers \
-	etonyek \
-	wpd \
-	wpg \
+	revenge \
 ))
 
 $(call gb_ExternalProject_get_state_target,libodfgen,build) :
diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk
index ce187354b001..dfdd5df648c7 100644
--- a/external/libodfgen/Library_odfgen.mk
+++ b/external/libodfgen/Library_odfgen.mk
@@ -13,9 +13,7 @@ $(eval $(call gb_Library_use_unpacked,odfgen,libodfgen))
 
 $(eval $(call gb_Library_use_externals,odfgen,\
     boost_headers \
-	etonyek \
-	wpd \
-	wpg \
+	revenge \
 ))
 
 $(eval $(call gb_Library_set_warnings_not_errors,odfgen))
@@ -34,15 +32,21 @@ $(eval $(call gb_Library_add_defs,odfgen,\
 
 $(eval $(call gb_Library_add_generated_exception_objects,odfgen,\
     UnpackedTarball/libodfgen/src/DocumentElement \
+    UnpackedTarball/libodfgen/src/FilterInternal \
     UnpackedTarball/libodfgen/src/FontStyle \
     UnpackedTarball/libodfgen/src/GraphicFunctions \
+    UnpackedTarball/libodfgen/src/GraphicStyle \
     UnpackedTarball/libodfgen/src/InternalHandler \
     UnpackedTarball/libodfgen/src/ListStyle \
+    UnpackedTarball/libodfgen/src/OdcGenerator \
+    UnpackedTarball/libodfgen/src/OdfGenerator \
     UnpackedTarball/libodfgen/src/OdgGenerator \
     UnpackedTarball/libodfgen/src/OdpGenerator \
+    UnpackedTarball/libodfgen/src/OdsGenerator \
     UnpackedTarball/libodfgen/src/OdtGenerator \
     UnpackedTarball/libodfgen/src/PageSpan \
     UnpackedTarball/libodfgen/src/SectionStyle \
+    UnpackedTarball/libodfgen/src/SheetStyle \
     UnpackedTarball/libodfgen/src/TableStyle \
     UnpackedTarball/libodfgen/src/TextRunStyle \
 ))