a7b857d
From e7836800ed8edc25284ac690acee2ce0819d5de1 Mon Sep 17 00:00:00 2001
d0c0791
From: David Tardon <dtardon@redhat.com>
1a5ee85
Date: Thu, 21 Aug 2014 16:10:51 +0200
d0c0791
Subject: [PATCH] disable libe-book support
d0c0791
1a5ee85
Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
d0c0791
---
f5c2428
 configure.ac                                             |  5 -----
f5c2428
 external/Module_external.mk                              |  1 -
f5c2428
 filter/Configuration_filter.mk                           | 14 --------------
f5c2428
 writerperfect/Library_wpftwriter.mk                      |  2 --
f5c2428
 writerperfect/qa/unit/WpftWriterFilterTest.cxx           |  1 -
07cdfb9
 writerperfect/source/writer/wpftwriter.component         |  4 ----
9ce0047
 writerperfect/source/writer/wpftwriter_genericfilter.cxx |  6 ------
07cdfb9
 7 files changed, 33 deletions(-)
d0c0791
d0c0791
diff --git a/configure.ac b/configure.ac
a7b857d
index ed71d8f..32fa8ae 100644
d0c0791
--- a/configure.ac
d0c0791
+++ b/configure.ac
a7b857d
@@ -7583,11 +7583,6 @@ AS_IF([test "$COM" = "MSC"],
1a5ee85
 libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"])
d0c0791
 
d0c0791
 dnl ===================================================================
d0c0791
-dnl Check for system libe-book
d0c0791
-dnl ===================================================================
1a5ee85
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1 >= 0.1.1])
d0c0791
-
d0c0791
-dnl ===================================================================
d0c0791
 dnl Check for system libetonyek
d0c0791
 dnl ===================================================================
1dae3ba
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.4])
1a5ee85
diff --git a/external/Module_external.mk b/external/Module_external.mk
9ce0047
index 6d38fd5..25cb2d9 100644
1a5ee85
--- a/external/Module_external.mk
1a5ee85
+++ b/external/Module_external.mk
9ce0047
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
1a5ee85
 	$(call gb_Helper_optional,CPPUNIT,cppunit) \
1a5ee85
 	$(call gb_Helper_optional,CT2N,ct2n) \
1a5ee85
 	$(call gb_Helper_optional,CURL,curl) \
1a5ee85
-	$(call gb_Helper_optional,EBOOK,libebook) \
1a5ee85
 	$(call gb_Helper_optional,EPM,epm) \
1a5ee85
 	$(call gb_Helper_optional,ETONYEK,libetonyek) \
1a5ee85
 	$(call gb_Helper_optional,EXPAT,expat) \
f5c2428
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
a7b857d
index 29e672b..213e981 100644
f5c2428
--- a/filter/Configuration_filter.mk
f5c2428
+++ b/filter/Configuration_filter.mk
9ce0047
@@ -362,13 +362,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
f5c2428
 	writer_OOXML \
f5c2428
 	writer_OOXML_Template \
f5c2428
 	writer_layout_dump_xml \
f5c2428
-	writer_BroadBand_eBook \
f5c2428
-	writer_eReader_eBook \
f5c2428
-	writer_FictionBook_2 \
f5c2428
-	writer_PalmDoc \
f5c2428
-	writer_Plucker_eBook \
f5c2428
-	writer_TealDoc \
f5c2428
-	writer_zTXT \
a7b857d
 	writer_ApplePages \
4497e33
 ))
f5c2428
 
a7b857d
@@ -425,13 +418,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
f5c2428
 	OOXML_Text \
f5c2428
 	OOXML_Text_Template \
f5c2428
 	writer_layout_dump \
f5c2428
-	BroadBand_eBook \
f5c2428
-	eReader_eBook \
f5c2428
-	FictionBook_2 \
f5c2428
-	PalmDoc \
f5c2428
-	Plucker_eBook \
f5c2428
-	TealDoc \
f5c2428
-	zTXT \
a7b857d
 	ApplePages \
4497e33
 ))
f5c2428
 
d0c0791
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
a7b857d
index 8557991..288c929 100644
d0c0791
--- a/writerperfect/Library_wpftwriter.mk
d0c0791
+++ b/writerperfect/Library_wpftwriter.mk
a7b857d
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
d0c0791
 $(eval $(call gb_Library_use_externals,wpftwriter,\
d0c0791
 	abw \
d0c0791
 	boost_headers \
d0c0791
-	ebook \
a7b857d
 	etonyek \
d0c0791
 	icui18n \
1a5ee85
 	icuuc \
a7b857d
@@ -65,7 +64,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
d0c0791
 
d0c0791
 $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
d0c0791
 	writerperfect/source/writer/AbiWordImportFilter \
d0c0791
-	writerperfect/source/writer/EBookImportFilter \
d0c0791
 	writerperfect/source/writer/MSWorksImportFilter \
d0c0791
 	writerperfect/source/writer/MWAWImportFilter \
a7b857d
 	writerperfect/source/writer/PagesImportFilter \
f5c2428
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
a7b857d
index f8f9f85..d928f52 100644
f5c2428
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
f5c2428
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
f5c2428
@@ -32,7 +32,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
f5c2428
 void WpftWriterFilterTest::test()
f5c2428
 {
f5c2428
     doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
f5c2428
-    doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/");
f5c2428
     doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/");
f5c2428
     doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/");
a7b857d
     doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/");
07cdfb9
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
a7b857d
index eaf751a..4b8efbf 100644
07cdfb9
--- a/writerperfect/source/writer/wpftwriter.component
07cdfb9
+++ b/writerperfect/source/writer/wpftwriter.component
a7b857d
@@ -34,10 +34,6 @@
07cdfb9
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
07cdfb9
     <service name="com.sun.star.document.ImportFilter"/>
07cdfb9
   </implementation>
07cdfb9
-  <implementation name="org.libreoffice.comp.Writer.EBookImportFilter">
07cdfb9
-    <service name="com.sun.star.document.ExtendedTypeDetection"/>
07cdfb9
-    <service name="com.sun.star.document.ImportFilter"/>
07cdfb9
-  </implementation>
a7b857d
   <implementation name="org.libreoffice.comp.Writer.PagesImportFilter">
a7b857d
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
a7b857d
     <service name="com.sun.star.document.ImportFilter"/>
d0c0791
diff --git a/writerperfect/source/writer/wpftwriter_genericfilter.cxx b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
a7b857d
index 3f508c4..7e10b9e 100644
d0c0791
--- a/writerperfect/source/writer/wpftwriter_genericfilter.cxx
d0c0791
+++ b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
d0c0791
@@ -32,7 +32,6 @@
d0c0791
 #include "sal/types.h"
d0c0791
 
d0c0791
 #include "AbiWordImportFilter.hxx"
d0c0791
-#include "EBookImportFilter.hxx"
d0c0791
 #include "WordPerfectImportFilter.hxx"
d0c0791
 #include "MSWorksImportFilter.hxx"
d0c0791
 #include "MWAWImportFilter.hxx"
a7b857d
@@ -64,11 +63,6 @@ static cppu::ImplementationEntry const services[] =
1dae3ba
         &cppu::createSingleComponentFactory, nullptr, 0
82bb8b3
     },
a7b857d
     {
82bb8b3
-        &EBookImportFilter_createInstance, &EBookImportFilter_getImplementationName,
82bb8b3
-        &EBookImportFilter_getSupportedServiceNames,
1dae3ba
-        &cppu::createSingleComponentFactory, nullptr, 0
82bb8b3
-    },
a7b857d
-    {
a7b857d
         &PagesImportFilter_createInstance, &PagesImportFilter_getImplementationName,
a7b857d
         &PagesImportFilter_getSupportedServiceNames,
1dae3ba
         &cppu::createSingleComponentFactory, nullptr, 0
d0c0791
-- 
a7b857d
2.4.2
d0c0791