rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

really disable libe-book

Browse Source
This commit is contained in:
David Tardon 2014-08-22 10:05:18 +02:00
parent 1a5ee85b3f
commit f5c2428789
1 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
0001-disable-libe-book-support.patch
View File

@ -1,4 +1,4 @@
From 9a48c01ba0e64581c5d104917cd3ba60d03ab9e0 Mon Sep 17 00:00:00 2001
From 0571c25e9a0994f71686227257123b17b21b5c8e Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 21 Aug 2014 16:10:51 +0200
Subject: [PATCH] disable libe-book support
@ -7,9 +7,11 @@ Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
---
configure.ac | 5 -----
external/Module_external.mk | 1 -
filter/Configuration_filter.mk | 14 --------------
writerperfect/Library_wpftwriter.mk | 2 --
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 1 -
writerperfect/source/writer/wpftwriter_genericfilter.cxx | 4 ----
4 files changed, 12 deletions(-)
6 files changed, 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2f19999..bde14a8 100644
@ -39,6 +41,38 @@ index 7049278..0e7fd60 100644
$(call gb_Helper_optional,EPM,epm) \
$(call gb_Helper_optional,ETONYEK,libetonyek) \
$(call gb_Helper_optional,EXPAT,expat) \
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 57d6940..fe77479 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -362,13 +362,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
writer_OOXML \
writer_OOXML_Template \
writer_layout_dump_xml \
- writer_BroadBand_eBook \
- writer_eReader_eBook \
- writer_FictionBook_2 \
- writer_PalmDoc \
- writer_Plucker_eBook \
- writer_TealDoc \
- writer_zTXT \
)
$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\
@@ -423,13 +416,6 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
OOXML_Text \
OOXML_Text_Template \
writer_layout_dump \
- BroadBand_eBook \
- eReader_eBook \
- FictionBook_2 \
- PalmDoc \
- Plucker_eBook \
- TealDoc \
- zTXT \
)
$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index db6afdf..e6ea0f5 100644
--- a/writerperfect/Library_wpftwriter.mk
@ -59,6 +93,18 @@ index db6afdf..e6ea0f5 100644
writerperfect/source/writer/ImportFilterBase \
writerperfect/source/writer/MSWorksImportFilter \
writerperfect/source/writer/MWAWImportFilter \
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 904daab..fb44878 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -32,7 +32,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
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/");
doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/");
doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/");
doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/");
diff --git a/writerperfect/source/writer/wpftwriter_genericfilter.cxx b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
index 05f6542..831bc38 100644
--- a/writerperfect/source/writer/wpftwriter_genericfilter.cxx