76e0e0
From 4cac125f90e0a3d6828d879cb06f3a4bac14321b Mon Sep 17 00:00:00 2001
76e0e0
From: David Tardon <dtardon@redhat.com>
76e0e0
Date: Thu, 21 Aug 2014 16:10:51 +0200
76e0e0
Subject: [PATCH] disable libe-book support
76e0e0
76e0e0
Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
76e0e0
---
76e0e0
 configure.ac                                     | 3 ---
76e0e0
 external/Module_external.mk                      | 1 -
76e0e0
 filter/Configuration_filter.mk                   | 8 --------
76e0e0
 writerperfect/Library_wpftwriter.mk              | 2 --
76e0e0
 writerperfect/qa/unit/WpftFilterFixture.hxx      | 4 ----
76e0e0
 writerperfect/qa/unit/WpftWriterFilterTest.cxx   | 5 -----
76e0e0
 writerperfect/source/writer/wpftwriter.component | 5 -----
76e0e0
 7 files changed, 28 deletions(-)
76e0e0
76e0e0
diff --git a/configure.ac b/configure.ac
76e0e0
index fe425319b8f8..4b8f6a95472c 100644
76e0e0
--- a/configure.ac
76e0e0
+++ b/configure.ac
76e0e0
@@ -8566,9 +8566,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
76e0e0
 
76e0e0
 libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
76e0e0
 
76e0e0
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
76e0e0
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
76e0e0
-
76e0e0
 libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
76e0e0
 
76e0e0
 libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
76e0e0
diff --git a/external/Module_external.mk b/external/Module_external.mk
76e0e0
index 41e018d2ef3f..1b7627a1b3e2 100644
76e0e0
--- a/external/Module_external.mk
76e0e0
+++ b/external/Module_external.mk
76e0e0
@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
76e0e0
 	$(call gb_Helper_optional,CT2N,ct2n) \
76e0e0
 	$(call gb_Helper_optional,CURL,curl) \
76e0e0
 	dtoa \
76e0e0
-	$(call gb_Helper_optional,EBOOK,libebook) \
76e0e0
 	$(call gb_Helper_optional,EPM,epm) \
76e0e0
 	$(call gb_Helper_optional,EPOXY,epoxy) \
76e0e0
 	$(call gb_Helper_optional,EPUBGEN,libepubgen) \
76e0e0
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
76e0e0
index e71ffacf8f25..74d2ef05c4aa 100644
76e0e0
--- a/filter/Configuration_filter.mk
76e0e0
+++ b/filter/Configuration_filter.mk
76e0e0
@@ -358,10 +358,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
76e0e0
 	writer_OOXML \
76e0e0
 	writer_OOXML_Template \
76e0e0
 	writer_layout_dump_xml \
76e0e0
-	writer_BroadBand_eBook \
76e0e0
-	writer_FictionBook_2 \
76e0e0
-	writer_PalmDoc \
76e0e0
-	writer_Plucker_eBook \
76e0e0
 	writer_ApplePages \
76e0e0
 	MWAW_Text_Document \
76e0e0
 	Palm_Text_Document \
76e0e0
@@ -406,10 +402,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
76e0e0
 	OOXML_Text \
76e0e0
 	OOXML_Text_Template \
76e0e0
 	writer_layout_dump \
76e0e0
-	BroadBand_eBook \
76e0e0
-	FictionBook_2 \
76e0e0
-	PalmDoc \
76e0e0
-	Plucker_eBook \
76e0e0
 	ApplePages \
76e0e0
 	MWAW_Text_Document \
76e0e0
 	Palm_Text_Document \
76e0e0
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
76e0e0
index 8993cca31490..b6e11f356d97 100644
76e0e0
--- a/writerperfect/Library_wpftwriter.mk
76e0e0
+++ b/writerperfect/Library_wpftwriter.mk
76e0e0
@@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
76e0e0
 $(eval $(call gb_Library_use_externals,wpftwriter,\
76e0e0
 	abw \
76e0e0
 	boost_headers \
76e0e0
-	ebook \
76e0e0
 	epubgen \
76e0e0
 	etonyek \
76e0e0
 	icu_headers \
76e0e0
@@ -73,7 +72,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
76e0e0
 
76e0e0
 $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
76e0e0
 	writerperfect/source/writer/AbiWordImportFilter \
76e0e0
-	writerperfect/source/writer/EBookImportFilter \
76e0e0
 	writerperfect/source/writer/EPUBExportDialog \
76e0e0
 	writerperfect/source/writer/EPUBExportFilter \
76e0e0
 	writerperfect/source/writer/EPUBExportUIComponent \
76e0e0
diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
76e0e0
index f32478165617..f42edb0d7f55 100644
76e0e0
--- a/writerperfect/qa/unit/WpftFilterFixture.hxx
76e0e0
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
76e0e0
@@ -26,10 +26,6 @@
76e0e0
         || ((major) == (req_major)                                                                 \
76e0e0
             && ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
76e0e0
 
76e0e0
-#define REQUIRE_EBOOK_VERSION(major, minor, micro)                                                 \
76e0e0
-    REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor,   \
76e0e0
-                    micro)
76e0e0
-
76e0e0
 #define REQUIRE_ETONYEK_VERSION(major, minor, micro)                                               \
76e0e0
     REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major,    \
76e0e0
                     minor, micro)
76e0e0
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
76e0e0
index 8bc4c7cadbb3..eca43caf8d8c 100644
76e0e0
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
76e0e0
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
76e0e0
@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
76e0e0
 
76e0e0
 void WpftWriterFilterTest::test()
76e0e0
 {
76e0e0
-    const writerperfect::test::WpftOptionalMap_t aEBookOptional{
76e0e0
-        { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) },
76e0e0
-    };
76e0e0
     const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
76e0e0
         { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
76e0e0
         { "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
76e0e0
@@ -54,8 +51,6 @@ void WpftWriterFilterTest::test()
76e0e0
 
76e0e0
     doTest("com.sun.star.comp.Writer.AbiWordImportFilter",
76e0e0
            "/writerperfect/qa/unit/data/writer/libabw/");
76e0e0
-    doTest("org.libreoffice.comp.Writer.EBookImportFilter",
76e0e0
-           "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
76e0e0
     doTest("com.sun.star.comp.Writer.MSWorksImportFilter",
76e0e0
            "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
76e0e0
     doTest("com.sun.star.comp.Writer.MWAWImportFilter",
76e0e0
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
76e0e0
index 8ab436634052..2720023baedf 100644
76e0e0
--- a/writerperfect/source/writer/wpftwriter.component
76e0e0
+++ b/writerperfect/source/writer/wpftwriter.component
76e0e0
@@ -38,11 +38,6 @@
76e0e0
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
76e0e0
     <service name="com.sun.star.document.ImportFilter"/>
76e0e0
   </implementation>
76e0e0
-  
76e0e0
-      constructor="org_libreoffice_comp_Writer_EBookImportFilter_get_implementation">
76e0e0
-    <service name="com.sun.star.document.ExtendedTypeDetection"/>
76e0e0
-    <service name="com.sun.star.document.ImportFilter"/>
76e0e0
-  </implementation>
76e0e0
   
76e0e0
       constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
76e0e0
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
76e0e0
-- 
76e0e0
2.25.1
76e0e0