From af3156dd92c03e0005d55e88e6e45bca93a117ee Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 21 Aug 2014 16:10:51 +0200 Subject: [PATCH] disable libe-book support Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4 --- configure.ac | 6 ------ external/Module_external.mk | 1 - filter/Configuration_filter.mk | 8 -------- writerperfect/Library_wpftwriter.mk | 2 -- writerperfect/qa/unit/WpftImportTestBase.hxx | 3 --- writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 ----- writerperfect/source/writer/wpftwriter.component | 5 ----- 7 files changed, 30 deletions(-) diff --git a/configure.ac b/configure.ac index 62f753b..647ca87 100644 --- a/configure.ac +++ b/configure.ac @@ -7757,12 +7757,6 @@ AS_IF([test "$COM" = "MSC"], libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"]) dnl =================================================================== -dnl Check for system libe-book -dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1]) -libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2]) - -dnl =================================================================== dnl Check for system libetonyek dnl =================================================================== libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) diff --git a/external/Module_external.mk b/external/Module_external.mk index 44280e3..b496331 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CPPUNIT,cppunit) \ $(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,CURL,curl) \ - $(call gb_Helper_optional,EBOOK,libebook) \ $(call gb_Helper_optional,EPM,epm) \ $(call gb_Helper_optional,ETONYEK,libetonyek) \ $(call gb_Helper_optional,EXPAT,expat) \ diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 5dd20f7..d3dc749 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -345,10 +345,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu writer_OOXML \ writer_OOXML_Template \ writer_layout_dump_xml \ - writer_BroadBand_eBook \ - writer_FictionBook_2 \ - writer_PalmDoc \ - writer_Plucker_eBook \ writer_ApplePages \ MWAW_Text_Document \ Palm_Text_Document \ @@ -390,10 +386,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters OOXML_Text \ OOXML_Text_Template \ writer_layout_dump \ - BroadBand_eBook \ - FictionBook_2 \ - PalmDoc \ - Plucker_eBook \ ApplePages \ MWAW_Text_Document \ Palm_Text_Document \ diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index 9ec43c4..48cbd52 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ $(eval $(call gb_Library_use_externals,wpftwriter,\ abw \ boost_headers \ - ebook \ etonyek \ icui18n \ icuuc \ @@ -65,7 +64,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\ $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ writerperfect/source/writer/AbiWordImportFilter \ - writerperfect/source/writer/EBookImportFilter \ writerperfect/source/writer/MSWorksImportFilter \ writerperfect/source/writer/MWAWImportFilter \ writerperfect/source/writer/PagesImportFilter \ diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx index ce70172..d73d435 100644 --- a/writerperfect/qa/unit/WpftImportTestBase.hxx +++ b/writerperfect/qa/unit/WpftImportTestBase.hxx @@ -29,9 +29,6 @@ ((minor) > (req_minor) \ || ((minor) == (req_minor) && ((micro) >= (req_micro))))) -#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ - REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro) - #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro) diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx index 99a6ab1..7de2c18 100644 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx @@ -31,10 +31,6 @@ WpftWriterFilterTest::WpftWriterFilterTest() void WpftWriterFilterTest::test() { - const writerperfect::test::WpftOptionalMap_t aEBookOptional - { - {"FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1)}, - }; const writerperfect::test::WpftOptionalMap_t aEtonyekOptional { {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, @@ -52,7 +48,6 @@ void WpftWriterFilterTest::test() }; doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); - doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional); doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional); diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component index 4c5f37f..d815802 100644 --- a/writerperfect/source/writer/wpftwriter.component +++ b/writerperfect/source/writer/wpftwriter.component @@ -38,11 +38,6 @@ - - - - -- 2.5.0