From 0b613b941c3ffbe432934269f8865bc1f9e59cde Mon Sep 17 00:00:00 2001 From: rpm-build Date: Tue, 27 Sep 2022 15:13:59 -0700 Subject: [PATCH] disable libe-book support --- 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 | 6 ------ 7 files changed, 29 deletions(-) diff --git a/configure.ac b/configure.ac index 8babc85..e7733de 100644 --- a/configure.ac +++ b/configure.ac @@ -9606,9 +9606,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) 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 366fff2..bc987d1 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CURL,curl) \ $(call gb_Helper_optional,DRAGONBOX,dragonbox) \ 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 a58b839..526b447 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -359,10 +359,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu writer_OOXML_Template \ writer_layout_dump_xml \ writer_indexing_export_xml \ - writer_BroadBand_eBook \ - writer_FictionBook_2 \ - writer_PalmDoc \ - writer_Plucker_eBook \ writer_ApplePages \ MWAW_Text_Document \ Palm_Text_Document \ @@ -409,10 +405,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters OOXML_Text_Template \ writer_layout_dump \ writer_indexing_export \ - 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 840a86f..70a8933 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -64,7 +64,6 @@ endif $(eval $(call gb_Library_use_externals,wpftwriter,\ abw \ boost_headers \ - ebook \ $(if $(ENABLE_WASM_STRIP_SWEXPORTS),,etonyek) \ icu_headers \ icui18n \ @@ -93,7 +92,6 @@ endif ifneq ($(ENABLE_WASM_STRIP_SWEXPORTS),TRUE) $(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/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx index 2fdd6a2..dbdd672 100644 --- a/writerperfect/qa/unit/WpftFilterFixture.hxx +++ b/writerperfect/qa/unit/WpftFilterFixture.hxx @@ -25,10 +25,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 78d24dc..39924f9 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) }, @@ -59,8 +56,6 @@ void WpftWriterFilterTest::test() doTest("com.sun.star.comp.Writer.AbiWordImportFilter", u"/writerperfect/qa/unit/data/writer/libabw/"); - doTest("org.libreoffice.comp.Writer.EBookImportFilter", - u"/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); doTest("com.sun.star.comp.Writer.MSWorksImportFilter", u"/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 176d487..0c89217 100644 --- a/writerperfect/source/writer/wpftwriter.component +++ b/writerperfect/source/writer/wpftwriter.component @@ -42,12 +42,6 @@ - - - - - -- 2.31.1