2126889
From d5a09cb1c8f61e2cfc60d8a1dfe57c1ed0a45cdc 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
---
f311720
 configure.ac                                     | 6 ------
f311720
 external/Module_external.mk                      | 1 -
f311720
 filter/Configuration_filter.mk                   | 8 --------
f311720
 writerperfect/Library_wpftwriter.mk              | 2 --
f311720
 writerperfect/qa/unit/WpftImportTestBase.hxx     | 3 ---
f311720
 writerperfect/qa/unit/WpftWriterFilterTest.cxx   | 5 -----
f311720
 writerperfect/source/writer/wpftwriter.component | 5 -----
f311720
 7 files changed, 30 deletions(-)
d0c0791
d0c0791
diff --git a/configure.ac b/configure.ac
2126889
index 5ec9ae6..7aed2ed 100644
d0c0791
--- a/configure.ac
d0c0791
+++ b/configure.ac
4ff3659
@@ -7796,9 +7796,6 @@ AS_IF([test "$COM" = "MSC"],
4ff3659
 
4ff3659
 libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
d0c0791
 
e469249
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
e469249
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
d0c0791
-
4ff3659
 libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
4ff3659
 
4ff3659
 libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
1a5ee85
diff --git a/external/Module_external.mk b/external/Module_external.mk
2126889
index 55fce1f..2f53503 100644
1a5ee85
--- a/external/Module_external.mk
1a5ee85
+++ b/external/Module_external.mk
f311720
@@ -37,7 +37,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) \
2126889
 	$(call gb_Helper_optional,EPOXY,epoxy) \
1a5ee85
 	$(call gb_Helper_optional,ETONYEK,libetonyek) \
f5c2428
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
f311720
index 5dd20f7..d3dc749 100644
f5c2428
--- a/filter/Configuration_filter.mk
f5c2428
+++ b/filter/Configuration_filter.mk
f311720
@@ -345,10 +345,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_FictionBook_2 \
f5c2428
-	writer_PalmDoc \
f5c2428
-	writer_Plucker_eBook \
a7b857d
 	writer_ApplePages \
e469249
 	MWAW_Text_Document \
e469249
 	Palm_Text_Document \
f311720
@@ -390,10 +386,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
-	FictionBook_2 \
f5c2428
-	PalmDoc \
f5c2428
-	Plucker_eBook \
a7b857d
 	ApplePages \
e469249
 	MWAW_Text_Document \
e469249
 	Palm_Text_Document \
d0c0791
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
f311720
index 9ec43c4..48cbd52 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 \
4ff3659
 	icu_headers \
d0c0791
 	icui18n \
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 \
1c6b9e3
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx
f311720
index ce70172..d73d435 100644
1c6b9e3
--- a/writerperfect/qa/unit/WpftImportTestBase.hxx
1c6b9e3
+++ b/writerperfect/qa/unit/WpftImportTestBase.hxx
1c6b9e3
@@ -29,9 +29,6 @@
1c6b9e3
         ((minor) > (req_minor) \
1c6b9e3
          || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
1c6b9e3
 
1c6b9e3
-#define REQUIRE_EBOOK_VERSION(major, minor, micro) \
1c6b9e3
-    REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro)
1c6b9e3
-
1c6b9e3
 #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
1c6b9e3
     REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro)
1c6b9e3
 
f5c2428
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
f311720
index 99a6ab1..7de2c18 100644
f5c2428
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
f5c2428
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
1c6b9e3
@@ -31,10 +31,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
1c6b9e3
 
1c6b9e3
 void WpftWriterFilterTest::test()
1c6b9e3
 {
1c6b9e3
-    const writerperfect::test::WpftOptionalMap_t aEBookOptional
1c6b9e3
-    {
1c6b9e3
-        {"FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1)},
1c6b9e3
-    };
1c6b9e3
     const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
1c6b9e3
     {
1c6b9e3
         {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
f311720
@@ -52,7 +48,6 @@ void WpftWriterFilterTest::test()
e469249
     };
e469249
 
f5c2428
     doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
e469249
-    doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
e469249
     doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
e469249
     doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional);
e469249
     doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional);
07cdfb9
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
f311720
index 4c5f37f..d815802 100644
07cdfb9
--- a/writerperfect/source/writer/wpftwriter.component
07cdfb9
+++ b/writerperfect/source/writer/wpftwriter.component
f311720
@@ -38,11 +38,6 @@
07cdfb9
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
07cdfb9
     <service name="com.sun.star.document.ImportFilter"/>
07cdfb9
   </implementation>
f311720
-  
f311720
-      constructor="org_libreoffice_comp_Writer_EBookImportFilter_get_implementation">
07cdfb9
-    <service name="com.sun.star.document.ExtendedTypeDetection"/>
07cdfb9
-    <service name="com.sun.star.document.ImportFilter"/>
07cdfb9
-  </implementation>
f311720
   
f311720
       constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
a7b857d
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
d0c0791
-- 
2126889
2.9.3
d0c0791