|
 |
31febb |
From 4cac125f90e0a3d6828d879cb06f3a4bac14321b Mon Sep 17 00:00:00 2001
|
|
|
31febb |
From: David Tardon <dtardon@redhat.com>
|
|
|
31febb |
Date: Thu, 21 Aug 2014 16:10:51 +0200
|
|
|
31febb |
Subject: [PATCH] disable libe-book support
|
|
|
31febb |
|
|
|
31febb |
Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
|
|
|
31febb |
---
|
|
|
31febb |
configure.ac | 3 ---
|
|
|
31febb |
external/Module_external.mk | 1 -
|
|
|
31febb |
filter/Configuration_filter.mk | 8 --------
|
|
|
31febb |
writerperfect/Library_wpftwriter.mk | 2 --
|
|
|
31febb |
writerperfect/qa/unit/WpftFilterFixture.hxx | 4 ----
|
|
|
31febb |
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 -----
|
|
|
31febb |
writerperfect/source/writer/wpftwriter.component | 5 -----
|
|
|
31febb |
7 files changed, 28 deletions(-)
|
|
|
31febb |
|
|
|
31febb |
diff --git a/configure.ac b/configure.ac
|
|
|
31febb |
index fe425319b8f8..4b8f6a95472c 100644
|
|
|
31febb |
--- a/configure.ac
|
|
|
31febb |
+++ b/configure.ac
|
|
|
31febb |
@@ -8566,9 +8566,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
|
|
|
31febb |
|
|
|
31febb |
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
|
|
|
31febb |
|
|
|
31febb |
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
|
|
|
31febb |
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
|
|
|
31febb |
-
|
|
|
31febb |
libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
|
|
|
31febb |
|
|
|
31febb |
libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
|
|
|
31febb |
diff --git a/external/Module_external.mk b/external/Module_external.mk
|
|
|
31febb |
index 41e018d2ef3f..1b7627a1b3e2 100644
|
|
|
31febb |
--- a/external/Module_external.mk
|
|
|
31febb |
+++ b/external/Module_external.mk
|
|
|
31febb |
@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
|
|
|
31febb |
$(call gb_Helper_optional,CT2N,ct2n) \
|
|
|
31febb |
$(call gb_Helper_optional,CURL,curl) \
|
|
|
31febb |
dtoa \
|
|
|
31febb |
- $(call gb_Helper_optional,EBOOK,libebook) \
|
|
|
31febb |
$(call gb_Helper_optional,EPM,epm) \
|
|
|
31febb |
$(call gb_Helper_optional,EPOXY,epoxy) \
|
|
|
31febb |
$(call gb_Helper_optional,EPUBGEN,libepubgen) \
|
|
|
31febb |
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
|
|
|
31febb |
index e71ffacf8f25..74d2ef05c4aa 100644
|
|
|
31febb |
--- a/filter/Configuration_filter.mk
|
|
|
31febb |
+++ b/filter/Configuration_filter.mk
|
|
|
31febb |
@@ -358,10 +358,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
|
|
|
31febb |
writer_OOXML \
|
|
|
31febb |
writer_OOXML_Template \
|
|
|
31febb |
writer_layout_dump_xml \
|
|
|
31febb |
- writer_BroadBand_eBook \
|
|
|
31febb |
- writer_FictionBook_2 \
|
|
|
31febb |
- writer_PalmDoc \
|
|
|
31febb |
- writer_Plucker_eBook \
|
|
|
31febb |
writer_ApplePages \
|
|
|
31febb |
MWAW_Text_Document \
|
|
|
31febb |
Palm_Text_Document \
|
|
|
31febb |
@@ -406,10 +402,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
|
|
|
31febb |
OOXML_Text \
|
|
|
31febb |
OOXML_Text_Template \
|
|
|
31febb |
writer_layout_dump \
|
|
|
31febb |
- BroadBand_eBook \
|
|
|
31febb |
- FictionBook_2 \
|
|
|
31febb |
- PalmDoc \
|
|
|
31febb |
- Plucker_eBook \
|
|
|
31febb |
ApplePages \
|
|
|
31febb |
MWAW_Text_Document \
|
|
|
31febb |
Palm_Text_Document \
|
|
|
31febb |
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
|
|
|
31febb |
index 8993cca31490..b6e11f356d97 100644
|
|
|
31febb |
--- a/writerperfect/Library_wpftwriter.mk
|
|
|
31febb |
+++ b/writerperfect/Library_wpftwriter.mk
|
|
|
31febb |
@@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
|
|
|
31febb |
$(eval $(call gb_Library_use_externals,wpftwriter,\
|
|
|
31febb |
abw \
|
|
|
31febb |
boost_headers \
|
|
|
31febb |
- ebook \
|
|
|
31febb |
epubgen \
|
|
|
31febb |
etonyek \
|
|
|
31febb |
icu_headers \
|
|
|
31febb |
@@ -73,7 +72,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
|
|
|
31febb |
|
|
|
31febb |
$(eval $(call gb_Library_add_exception_objects,wpftwriter,\
|
|
|
31febb |
writerperfect/source/writer/AbiWordImportFilter \
|
|
|
31febb |
- writerperfect/source/writer/EBookImportFilter \
|
|
|
31febb |
writerperfect/source/writer/EPUBExportDialog \
|
|
|
31febb |
writerperfect/source/writer/EPUBExportFilter \
|
|
|
31febb |
writerperfect/source/writer/EPUBExportUIComponent \
|
|
|
31febb |
diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
|
|
|
31febb |
index f32478165617..f42edb0d7f55 100644
|
|
|
31febb |
--- a/writerperfect/qa/unit/WpftFilterFixture.hxx
|
|
|
31febb |
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
|
|
|
31febb |
@@ -26,10 +26,6 @@
|
|
|
31febb |
|| ((major) == (req_major) \
|
|
|
31febb |
&& ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
|
|
|
31febb |
|
|
|
31febb |
-#define REQUIRE_EBOOK_VERSION(major, minor, micro) \
|
|
|
31febb |
- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, \
|
|
|
31febb |
- micro)
|
|
|
31febb |
-
|
|
|
31febb |
#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
|
|
|
31febb |
REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, \
|
|
|
31febb |
minor, micro)
|
|
|
31febb |
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
31febb |
index 8bc4c7cadbb3..eca43caf8d8c 100644
|
|
|
31febb |
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
31febb |
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
31febb |
@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
|
|
|
31febb |
|
|
|
31febb |
void WpftWriterFilterTest::test()
|
|
|
31febb |
{
|
|
|
31febb |
- const writerperfect::test::WpftOptionalMap_t aEBookOptional{
|
|
|
31febb |
- { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) },
|
|
|
31febb |
- };
|
|
|
31febb |
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
|
|
|
31febb |
{ "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
|
|
|
31febb |
{ "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
|
|
|
31febb |
@@ -54,8 +51,6 @@ void WpftWriterFilterTest::test()
|
|
|
31febb |
|
|
|
31febb |
doTest("com.sun.star.comp.Writer.AbiWordImportFilter",
|
|
|
31febb |
"/writerperfect/qa/unit/data/writer/libabw/");
|
|
|
31febb |
- doTest("org.libreoffice.comp.Writer.EBookImportFilter",
|
|
|
31febb |
- "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
|
|
|
31febb |
doTest("com.sun.star.comp.Writer.MSWorksImportFilter",
|
|
|
31febb |
"/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
|
|
|
31febb |
doTest("com.sun.star.comp.Writer.MWAWImportFilter",
|
|
|
31febb |
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
|
|
|
31febb |
index 8ab436634052..2720023baedf 100644
|
|
|
31febb |
--- a/writerperfect/source/writer/wpftwriter.component
|
|
|
31febb |
+++ b/writerperfect/source/writer/wpftwriter.component
|
|
|
31febb |
@@ -38,11 +38,6 @@
|
|
|
31febb |
<service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
31febb |
<service name="com.sun.star.document.ImportFilter"/>
|
|
|
31febb |
</implementation>
|
|
|
31febb |
-
|
|
|
31febb |
- constructor="org_libreoffice_comp_Writer_EBookImportFilter_get_implementation">
|
|
|
31febb |
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
31febb |
- <service name="com.sun.star.document.ImportFilter"/>
|
|
|
31febb |
- </implementation>
|
|
|
31febb |
|
|
|
31febb |
constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
|
|
|
31febb |
<service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
31febb |
--
|
|
|
31febb |
2.25.1
|
|
|
31febb |
|