bf2fec
From 613af296887aede8f5b0fa6f94f7fb2781403ef2 Mon Sep 17 00:00:00 2001
bf2fec
From: David Tardon <dtardon@redhat.com>
bf2fec
Date: Thu, 21 Aug 2014 16:10:51 +0200
bf2fec
Subject: [PATCH] disable libe-book support
bf2fec
bf2fec
Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
bf2fec
---
bf2fec
 configure.ac                                     | 3 ---
bf2fec
 external/Module_external.mk                      | 1 -
bf2fec
 filter/Configuration_filter.mk                   | 8 --------
bf2fec
 writerperfect/Library_wpftwriter.mk              | 2 --
bf2fec
 writerperfect/qa/unit/WpftFilterFixture.hxx      | 3 ---
bf2fec
 writerperfect/qa/unit/WpftWriterFilterTest.cxx   | 5 -----
bf2fec
 writerperfect/source/writer/wpftwriter.component | 5 -----
bf2fec
 7 files changed, 27 deletions(-)
bf2fec
bf2fec
diff --git a/configure.ac b/configure.ac
697d25
index bb17f3e..23d48da 100644
bf2fec
--- a/configure.ac
bf2fec
+++ b/configure.ac
697d25
@@ -8326,9 +8326,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
bf2fec
 
bf2fec
 libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
bf2fec
 
bf2fec
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
bf2fec
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
bf2fec
-
bf2fec
 libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
bf2fec
 
bf2fec
 libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
bf2fec
diff --git a/external/Module_external.mk b/external/Module_external.mk
697d25
index e9d53ee..5bc469f 100644
bf2fec
--- a/external/Module_external.mk
bf2fec
+++ b/external/Module_external.mk
697d25
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
bf2fec
 	$(call gb_Helper_optional,CPPUNIT,cppunit) \
bf2fec
 	$(call gb_Helper_optional,CT2N,ct2n) \
bf2fec
 	$(call gb_Helper_optional,CURL,curl) \
bf2fec
-	$(call gb_Helper_optional,EBOOK,libebook) \
bf2fec
 	$(call gb_Helper_optional,EPM,epm) \
bf2fec
 	$(call gb_Helper_optional,EPOXY,epoxy) \
bf2fec
 	$(call gb_Helper_optional,EPUBGEN,libepubgen) \
bf2fec
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
697d25
index 9702332..d250173 100644
bf2fec
--- a/filter/Configuration_filter.mk
bf2fec
+++ b/filter/Configuration_filter.mk
bf2fec
@@ -346,10 +346,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
bf2fec
 	writer_OOXML \
bf2fec
 	writer_OOXML_Template \
bf2fec
 	writer_layout_dump_xml \
bf2fec
-	writer_BroadBand_eBook \
bf2fec
-	writer_FictionBook_2 \
bf2fec
-	writer_PalmDoc \
bf2fec
-	writer_Plucker_eBook \
bf2fec
 	writer_ApplePages \
bf2fec
 	MWAW_Text_Document \
bf2fec
 	Palm_Text_Document \
bf2fec
@@ -394,10 +390,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
bf2fec
 	OOXML_Text \
bf2fec
 	OOXML_Text_Template \
bf2fec
 	writer_layout_dump \
bf2fec
-	BroadBand_eBook \
bf2fec
-	FictionBook_2 \
bf2fec
-	PalmDoc \
bf2fec
-	Plucker_eBook \
bf2fec
 	ApplePages \
bf2fec
 	MWAW_Text_Document \
bf2fec
 	Palm_Text_Document \
bf2fec
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
697d25
index 2ac6bd1..6585aba 100644
bf2fec
--- a/writerperfect/Library_wpftwriter.mk
bf2fec
+++ b/writerperfect/Library_wpftwriter.mk
697d25
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
bf2fec
 $(eval $(call gb_Library_use_externals,wpftwriter,\
bf2fec
 	abw \
bf2fec
 	boost_headers \
bf2fec
-	ebook \
bf2fec
 	epubgen \
bf2fec
 	etonyek \
bf2fec
 	icu_headers \
697d25
@@ -71,7 +70,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
bf2fec
 
bf2fec
 $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
bf2fec
 	writerperfect/source/writer/AbiWordImportFilter \
bf2fec
-	writerperfect/source/writer/EBookImportFilter \
bf2fec
 	writerperfect/source/writer/EPUBExportDialog \
bf2fec
 	writerperfect/source/writer/EPUBExportFilter \
bf2fec
 	writerperfect/source/writer/EPUBExportUIComponent \
bf2fec
diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
697d25
index f324781..f42edb0 100644
bf2fec
--- a/writerperfect/qa/unit/WpftFilterFixture.hxx
bf2fec
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
697d25
@@ -26,10 +26,6 @@
697d25
         || ((major) == (req_major)                                                                 \
697d25
             && ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
bf2fec
 
697d25
-#define REQUIRE_EBOOK_VERSION(major, minor, micro)                                                 \
697d25
-    REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor,   \
697d25
-                    micro)
bf2fec
-
697d25
 #define REQUIRE_ETONYEK_VERSION(major, minor, micro)                                               \
697d25
     REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major,    \
697d25
                     minor, micro)
bf2fec
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
697d25
index 8bc4c7c..eca43ca 100644
bf2fec
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
bf2fec
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
697d25
@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
bf2fec
 
bf2fec
 void WpftWriterFilterTest::test()
bf2fec
 {
697d25
-    const writerperfect::test::WpftOptionalMap_t aEBookOptional{
697d25
-        { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) },
bf2fec
-    };
697d25
     const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
697d25
         { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
697d25
         { "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
697d25
@@ -54,8 +51,6 @@ void WpftWriterFilterTest::test()
bf2fec
 
697d25
     doTest("com.sun.star.comp.Writer.AbiWordImportFilter",
697d25
            "/writerperfect/qa/unit/data/writer/libabw/");
697d25
-    doTest("org.libreoffice.comp.Writer.EBookImportFilter",
697d25
-           "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
697d25
     doTest("com.sun.star.comp.Writer.MSWorksImportFilter",
697d25
            "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
697d25
     doTest("com.sun.star.comp.Writer.MWAWImportFilter",
bf2fec
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
bf2fec
index 8ab4366..2720023 100644
bf2fec
--- a/writerperfect/source/writer/wpftwriter.component
bf2fec
+++ b/writerperfect/source/writer/wpftwriter.component
bf2fec
@@ -38,11 +38,6 @@
bf2fec
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
bf2fec
     <service name="com.sun.star.document.ImportFilter"/>
bf2fec
   </implementation>
bf2fec
-  
bf2fec
-      constructor="org_libreoffice_comp_Writer_EBookImportFilter_get_implementation">
bf2fec
-    <service name="com.sun.star.document.ExtendedTypeDetection"/>
bf2fec
-    <service name="com.sun.star.document.ImportFilter"/>
bf2fec
-  </implementation>
bf2fec
   
bf2fec
       constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
bf2fec
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
bf2fec
-- 
697d25
2.24.1
bf2fec