|
 |
f325b2 |
From e7836800ed8edc25284ac690acee2ce0819d5de1 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
Date: Thu, 21 Aug 2014 16:10:51 +0200
|
|
|
f325b2 |
Subject: [PATCH] disable libe-book support
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
|
|
|
f325b2 |
---
|
|
|
f325b2 |
configure.ac | 5 -----
|
|
|
f325b2 |
external/Module_external.mk | 1 -
|
|
|
f325b2 |
filter/Configuration_filter.mk | 14 --------------
|
|
|
f325b2 |
writerperfect/Library_wpftwriter.mk | 2 --
|
|
|
f325b2 |
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 1 -
|
|
|
f325b2 |
writerperfect/source/writer/wpftwriter.component | 4 ----
|
|
|
f325b2 |
writerperfect/source/writer/wpftwriter_genericfilter.cxx | 6 ------
|
|
|
f325b2 |
7 files changed, 33 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/configure.ac b/configure.ac
|
|
|
f325b2 |
index ed71d8f..32fa8ae 100644
|
|
|
f325b2 |
--- a/configure.ac
|
|
|
f325b2 |
+++ b/configure.ac
|
|
|
f325b2 |
@@ -7583,11 +7583,6 @@ AS_IF([test "$COM" = "MSC"],
|
|
|
f325b2 |
libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"])
|
|
|
f325b2 |
|
|
|
f325b2 |
dnl ===================================================================
|
|
|
f325b2 |
-dnl Check for system libe-book
|
|
|
f325b2 |
-dnl ===================================================================
|
|
|
f325b2 |
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1 >= 0.1.1])
|
|
|
f325b2 |
-
|
|
|
f325b2 |
-dnl ===================================================================
|
|
|
f325b2 |
dnl Check for system libetonyek
|
|
|
f325b2 |
dnl ===================================================================
|
|
|
f325b2 |
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.2])
|
|
|
f325b2 |
diff --git a/external/Module_external.mk b/external/Module_external.mk
|
|
|
f325b2 |
index 6d38fd5..25cb2d9 100644
|
|
|
f325b2 |
--- a/external/Module_external.mk
|
|
|
f325b2 |
+++ b/external/Module_external.mk
|
|
|
f325b2 |
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
|
|
|
f325b2 |
$(call gb_Helper_optional,CPPUNIT,cppunit) \
|
|
|
f325b2 |
$(call gb_Helper_optional,CT2N,ct2n) \
|
|
|
f325b2 |
$(call gb_Helper_optional,CURL,curl) \
|
|
|
f325b2 |
- $(call gb_Helper_optional,EBOOK,libebook) \
|
|
|
f325b2 |
$(call gb_Helper_optional,EPM,epm) \
|
|
|
f325b2 |
$(call gb_Helper_optional,ETONYEK,libetonyek) \
|
|
|
f325b2 |
$(call gb_Helper_optional,EXPAT,expat) \
|
|
|
f325b2 |
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
|
|
|
f325b2 |
index 29e672b..213e981 100644
|
|
|
f325b2 |
--- a/filter/Configuration_filter.mk
|
|
|
f325b2 |
+++ b/filter/Configuration_filter.mk
|
|
|
f325b2 |
@@ -362,13 +362,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
|
|
|
f325b2 |
writer_OOXML \
|
|
|
f325b2 |
writer_OOXML_Template \
|
|
|
f325b2 |
writer_layout_dump_xml \
|
|
|
f325b2 |
- writer_BroadBand_eBook \
|
|
|
f325b2 |
- writer_eReader_eBook \
|
|
|
f325b2 |
- writer_FictionBook_2 \
|
|
|
f325b2 |
- writer_PalmDoc \
|
|
|
f325b2 |
- writer_Plucker_eBook \
|
|
|
f325b2 |
- writer_TealDoc \
|
|
|
f325b2 |
- writer_zTXT \
|
|
|
f325b2 |
writer_ApplePages \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -425,13 +418,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
|
|
|
f325b2 |
OOXML_Text \
|
|
|
f325b2 |
OOXML_Text_Template \
|
|
|
f325b2 |
writer_layout_dump \
|
|
|
f325b2 |
- BroadBand_eBook \
|
|
|
f325b2 |
- eReader_eBook \
|
|
|
f325b2 |
- FictionBook_2 \
|
|
|
f325b2 |
- PalmDoc \
|
|
|
f325b2 |
- Plucker_eBook \
|
|
|
f325b2 |
- TealDoc \
|
|
|
f325b2 |
- zTXT \
|
|
|
f325b2 |
ApplePages \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
|
|
|
f325b2 |
index 8557991..288c929 100644
|
|
|
f325b2 |
--- a/writerperfect/Library_wpftwriter.mk
|
|
|
f325b2 |
+++ b/writerperfect/Library_wpftwriter.mk
|
|
|
f325b2 |
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
|
|
|
f325b2 |
$(eval $(call gb_Library_use_externals,wpftwriter,\
|
|
|
f325b2 |
abw \
|
|
|
f325b2 |
boost_headers \
|
|
|
f325b2 |
- ebook \
|
|
|
f325b2 |
etonyek \
|
|
|
f325b2 |
icui18n \
|
|
|
f325b2 |
icuuc \
|
|
|
f325b2 |
@@ -65,7 +64,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
|
|
|
f325b2 |
|
|
|
f325b2 |
$(eval $(call gb_Library_add_exception_objects,wpftwriter,\
|
|
|
f325b2 |
writerperfect/source/writer/AbiWordImportFilter \
|
|
|
f325b2 |
- writerperfect/source/writer/EBookImportFilter \
|
|
|
f325b2 |
writerperfect/source/writer/MSWorksImportFilter \
|
|
|
f325b2 |
writerperfect/source/writer/MWAWImportFilter \
|
|
|
f325b2 |
writerperfect/source/writer/PagesImportFilter \
|
|
|
f325b2 |
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
f325b2 |
index f8f9f85..d928f52 100644
|
|
|
f325b2 |
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
f325b2 |
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
f325b2 |
@@ -32,7 +32,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
|
|
|
f325b2 |
void WpftWriterFilterTest::test()
|
|
|
f325b2 |
{
|
|
|
f325b2 |
doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
|
|
|
f325b2 |
- doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/");
|
|
|
f325b2 |
doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/");
|
|
|
f325b2 |
doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/");
|
|
|
f325b2 |
doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/");
|
|
|
f325b2 |
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
|
|
|
f325b2 |
index eaf751a..4b8efbf 100644
|
|
|
f325b2 |
--- a/writerperfect/source/writer/wpftwriter.component
|
|
|
f325b2 |
+++ b/writerperfect/source/writer/wpftwriter.component
|
|
|
f325b2 |
@@ -34,10 +34,6 @@
|
|
|
f325b2 |
<service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
f325b2 |
<service name="com.sun.star.document.ImportFilter"/>
|
|
|
f325b2 |
</implementation>
|
|
|
f325b2 |
- <implementation name="org.libreoffice.comp.Writer.EBookImportFilter">
|
|
|
f325b2 |
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
f325b2 |
- <service name="com.sun.star.document.ImportFilter"/>
|
|
|
f325b2 |
- </implementation>
|
|
|
f325b2 |
<implementation name="org.libreoffice.comp.Writer.PagesImportFilter">
|
|
|
f325b2 |
<service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
f325b2 |
<service name="com.sun.star.document.ImportFilter"/>
|
|
|
f325b2 |
diff --git a/writerperfect/source/writer/wpftwriter_genericfilter.cxx b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
|
|
|
f325b2 |
index 3f508c4..7e10b9e 100644
|
|
|
f325b2 |
--- a/writerperfect/source/writer/wpftwriter_genericfilter.cxx
|
|
|
f325b2 |
+++ b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
|
|
|
f325b2 |
@@ -32,7 +32,6 @@
|
|
|
f325b2 |
#include "sal/types.h"
|
|
|
f325b2 |
|
|
|
f325b2 |
#include "AbiWordImportFilter.hxx"
|
|
|
f325b2 |
-#include "EBookImportFilter.hxx"
|
|
|
f325b2 |
#include "WordPerfectImportFilter.hxx"
|
|
|
f325b2 |
#include "MSWorksImportFilter.hxx"
|
|
|
f325b2 |
#include "MWAWImportFilter.hxx"
|
|
|
f325b2 |
@@ -64,11 +63,6 @@ static cppu::ImplementationEntry const services[] =
|
|
|
f325b2 |
&cppu::createSingleComponentFactory, 0, 0
|
|
|
f325b2 |
},
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- &EBookImportFilter_createInstance, &EBookImportFilter_getImplementationName,
|
|
|
f325b2 |
- &EBookImportFilter_getSupportedServiceNames,
|
|
|
f325b2 |
- &cppu::createSingleComponentFactory, 0, 0
|
|
|
f325b2 |
- },
|
|
|
f325b2 |
- {
|
|
|
f325b2 |
&PagesImportFilter_createInstance, &PagesImportFilter_getImplementationName,
|
|
|
f325b2 |
&PagesImportFilter_getSupportedServiceNames,
|
|
|
f325b2 |
&cppu::createSingleComponentFactory, 0, 0
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.4.2
|
|
|
f325b2 |
|