From 4cac125f90e0a3d6828d879cb06f3a4bac14321b 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 | 3 --- external/Module_external.mk | 1 - filter/Configuration_filter.mk | 8 -------- writerperfect/Library_wpftwriter.mk | 2 -- writerperfect/qa/unit/WpftFilterFixture.hxx | 4 ---- writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 ----- writerperfect/source/writer/wpftwriter.component | 5 ----- 7 files changed, 28 deletions(-) diff --git a/configure.ac b/configure.ac index fe425319b8f8..4b8f6a95472c 100644 --- a/configure.ac +++ b/configure.ac @@ -8566,9 +8566,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8]) libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) -libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1]) -libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2]) - libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) diff --git a/external/Module_external.mk b/external/Module_external.mk index 41e018d2ef3f..1b7627a1b3e2 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,CURL,curl) \ dtoa \ - $(call gb_Helper_optional,EBOOK,libebook) \ $(call gb_Helper_optional,EPM,epm) \ $(call gb_Helper_optional,EPOXY,epoxy) \ $(call gb_Helper_optional,EPUBGEN,libepubgen) \ diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index e71ffacf8f25..74d2ef05c4aa 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -358,10 +358,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 \ @@ -406,10 +402,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 8993cca31490..b6e11f356d97 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ $(eval $(call gb_Library_use_externals,wpftwriter,\ abw \ boost_headers \ - ebook \ epubgen \ etonyek \ icu_headers \ @@ -73,7 +72,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/EPUBExportDialog \ writerperfect/source/writer/EPUBExportFilter \ writerperfect/source/writer/EPUBExportUIComponent \ diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx index f32478165617..f42edb0d7f55 100644 --- a/writerperfect/qa/unit/WpftFilterFixture.hxx +++ b/writerperfect/qa/unit/WpftFilterFixture.hxx @@ -26,10 +26,6 @@ || ((major) == (req_major) \ && ((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 8bc4c7cadbb3..eca43caf8d8c 100644 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx @@ -30,9 +30,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) }, { "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) }, @@ -54,8 +51,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", diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component index 8ab436634052..2720023baedf 100644 --- a/writerperfect/source/writer/wpftwriter.component +++ b/writerperfect/source/writer/wpftwriter.component @@ -38,11 +38,6 @@ - - - - -- 2.25.1