|
 |
1c6b9e3 |
From e75e433e943f7d082e81ea329ec0ca8747120e3b 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 |
---
|
|
|
e469249 |
configure.ac | 6 ------
|
|
|
e469249 |
external/Module_external.mk | 1 -
|
|
|
e469249 |
filter/Configuration_filter.mk | 8 --------
|
|
|
e469249 |
writerperfect/Library_wpftwriter.mk | 2 --
|
|
|
1c6b9e3 |
writerperfect/qa/unit/WpftImportTestBase.hxx | 3 ---
|
|
|
1c6b9e3 |
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 -----
|
|
|
e469249 |
writerperfect/source/writer/wpftwriter.component | 4 ----
|
|
|
e469249 |
writerperfect/source/writer/wpftwriter_genericfilter.cxx | 6 ------
|
|
|
1c6b9e3 |
8 files changed, 35 deletions(-)
|
|
|
d0c0791 |
|
|
|
d0c0791 |
diff --git a/configure.ac b/configure.ac
|
|
|
e469249 |
index 58a53b5..be1b129 100644
|
|
|
d0c0791 |
--- a/configure.ac
|
|
|
d0c0791 |
+++ b/configure.ac
|
|
|
e469249 |
@@ -7686,12 +7686,6 @@ AS_IF([test "$COM" = "MSC"],
|
|
|
1a5ee85 |
libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"])
|
|
|
d0c0791 |
|
|
|
d0c0791 |
dnl ===================================================================
|
|
|
d0c0791 |
-dnl Check for system libe-book
|
|
|
d0c0791 |
-dnl ===================================================================
|
|
|
e469249 |
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
|
|
|
e469249 |
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
|
|
|
d0c0791 |
-
|
|
|
d0c0791 |
-dnl ===================================================================
|
|
|
d0c0791 |
dnl Check for system libetonyek
|
|
|
d0c0791 |
dnl ===================================================================
|
|
|
e469249 |
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
|
|
|
1a5ee85 |
diff --git a/external/Module_external.mk b/external/Module_external.mk
|
|
|
e469249 |
index 7c78c7d..d63db6b 100644
|
|
|
1a5ee85 |
--- a/external/Module_external.mk
|
|
|
1a5ee85 |
+++ b/external/Module_external.mk
|
|
|
e469249 |
@@ -35,7 +35,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) \
|
|
|
1a5ee85 |
$(call gb_Helper_optional,ETONYEK,libetonyek) \
|
|
|
1a5ee85 |
$(call gb_Helper_optional,EXPAT,expat) \
|
|
|
f5c2428 |
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
|
|
|
e469249 |
index 4183b34..3a5b538 100644
|
|
|
f5c2428 |
--- a/filter/Configuration_filter.mk
|
|
|
f5c2428 |
+++ b/filter/Configuration_filter.mk
|
|
|
e469249 |
@@ -344,10 +344,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 \
|
|
|
e469249 |
@@ -388,10 +384,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
|
|
|
a7b857d |
index 8557991..288c929 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 \
|
|
|
d0c0791 |
icui18n \
|
|
|
1a5ee85 |
icuuc \
|
|
|
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
|
|
|
1c6b9e3 |
index 7e20987..514561f 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
|
|
|
1c6b9e3 |
index 9e8bd02..5e3a04d 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)},
|
|
|
1c6b9e3 |
@@ -51,7 +47,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
|
|
|
a7b857d |
index eaf751a..4b8efbf 100644
|
|
|
07cdfb9 |
--- a/writerperfect/source/writer/wpftwriter.component
|
|
|
07cdfb9 |
+++ b/writerperfect/source/writer/wpftwriter.component
|
|
|
a7b857d |
@@ -34,10 +34,6 @@
|
|
|
07cdfb9 |
<service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
07cdfb9 |
<service name="com.sun.star.document.ImportFilter"/>
|
|
|
07cdfb9 |
</implementation>
|
|
|
07cdfb9 |
- <implementation name="org.libreoffice.comp.Writer.EBookImportFilter">
|
|
|
07cdfb9 |
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
07cdfb9 |
- <service name="com.sun.star.document.ImportFilter"/>
|
|
|
07cdfb9 |
- </implementation>
|
|
|
a7b857d |
<implementation name="org.libreoffice.comp.Writer.PagesImportFilter">
|
|
|
a7b857d |
<service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
a7b857d |
<service name="com.sun.star.document.ImportFilter"/>
|
|
|
d0c0791 |
diff --git a/writerperfect/source/writer/wpftwriter_genericfilter.cxx b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
|
|
|
e469249 |
index 6841117..de683b2 100644
|
|
|
d0c0791 |
--- a/writerperfect/source/writer/wpftwriter_genericfilter.cxx
|
|
|
d0c0791 |
+++ b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
|
|
|
d0c0791 |
@@ -32,7 +32,6 @@
|
|
|
d0c0791 |
#include "sal/types.h"
|
|
|
d0c0791 |
|
|
|
d0c0791 |
#include "AbiWordImportFilter.hxx"
|
|
|
d0c0791 |
-#include "EBookImportFilter.hxx"
|
|
|
d0c0791 |
#include "WordPerfectImportFilter.hxx"
|
|
|
d0c0791 |
#include "MSWorksImportFilter.hxx"
|
|
|
d0c0791 |
#include "MWAWImportFilter.hxx"
|
|
|
a7b857d |
@@ -64,11 +63,6 @@ static cppu::ImplementationEntry const services[] =
|
|
|
1dae3ba |
&cppu::createSingleComponentFactory, nullptr, 0
|
|
|
82bb8b3 |
},
|
|
|
a7b857d |
{
|
|
|
82bb8b3 |
- &EBookImportFilter_createInstance, &EBookImportFilter_getImplementationName,
|
|
|
82bb8b3 |
- &EBookImportFilter_getSupportedServiceNames,
|
|
|
1dae3ba |
- &cppu::createSingleComponentFactory, nullptr, 0
|
|
|
82bb8b3 |
- },
|
|
|
a7b857d |
- {
|
|
|
a7b857d |
&PagesImportFilter_createInstance, &PagesImportFilter_getImplementationName,
|
|
|
a7b857d |
&PagesImportFilter_getSupportedServiceNames,
|
|
|
1dae3ba |
&cppu::createSingleComponentFactory, nullptr, 0
|
|
|
d0c0791 |
--
|
|
|
e469249 |
2.5.0
|
|
|
d0c0791 |
|