cbd75ae
From 192812819ed978d98cdec944cf51b40edbff1155 Mon Sep 17 00:00:00 2001
93572ea
From: David Tardon <dtardon@redhat.com>
93572ea
Date: Thu, 21 Aug 2014 14:49:53 +0200
93572ea
Subject: [PATCH] disable libe-book support
93572ea
93572ea
Change-Id: I7aab13e9aac90f678231c0176d0d96aa09bea813
93572ea
---
cbd75ae
 configure.ac                                             |  5 -----
cbd75ae
 filter/Configuration_filter.mk                           | 14 --------------
cbd75ae
 writerperfect/Library_wpftwriter.mk                      |  2 --
cbd75ae
 writerperfect/source/writer/wpftwriter_genericfilter.cxx |  4 ----
cbd75ae
 4 files changed, 25 deletions(-)
93572ea
93572ea
diff --git a/configure.ac b/configure.ac
93572ea
index 2560a0d..e46f407 100644
93572ea
--- a/configure.ac
93572ea
+++ b/configure.ac
93572ea
@@ -7724,11 +7724,6 @@ fi
93572ea
 AC_SUBST([ENABLE_EOT])
93572ea
 
93572ea
 dnl ===================================================================
93572ea
-dnl Check for system libe-book
93572ea
-dnl ===================================================================
93572ea
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.0 >= 0.0.2],["-I${WORKDIR}/UnpackedTarball/libebook/inc"],["-L${WORKDIR}/UnpackedTarball/libebook/src/lib/.libs -le-book-0.0"])
93572ea
-
93572ea
-dnl ===================================================================
93572ea
 dnl Check for system libetonyek
93572ea
 dnl ===================================================================
93572ea
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.0],["-I${WORKDIR}/UnpackedTarball/libetonyek/inc"],["-L${WORKDIR}/UnpackedTarball/libetonyek/src/lib/.libs -letonyek-0.0"])
cbd75ae
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
cbd75ae
index fe84350..7c520fc 100644
cbd75ae
--- a/filter/Configuration_filter.mk
cbd75ae
+++ b/filter/Configuration_filter.mk
cbd75ae
@@ -362,13 +362,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
cbd75ae
 	writer_OOXML \
cbd75ae
 	writer_OOXML_Template \
cbd75ae
 	writer_layout_dump_xml \
cbd75ae
-	writer_BroadBand_eBook \
cbd75ae
-	writer_eReader_eBook \
cbd75ae
-	writer_FictionBook_2 \
cbd75ae
-	writer_PalmDoc \
cbd75ae
-	writer_Plucker_eBook \
cbd75ae
-	writer_TealDoc \
cbd75ae
-	writer_zTXT \
cbd75ae
 )
cbd75ae
 
cbd75ae
 $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\
cbd75ae
@@ -424,13 +417,6 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
cbd75ae
 	OOXML_Text \
cbd75ae
 	OOXML_Text_Template \
cbd75ae
 	writer_layout_dump \
cbd75ae
-	BroadBand_eBook \
cbd75ae
-	eReader_eBook \
cbd75ae
-	FictionBook_2 \
cbd75ae
-	PalmDoc \
cbd75ae
-	Plucker_eBook \
cbd75ae
-	TealDoc \
cbd75ae
-	zTXT \
cbd75ae
 )
cbd75ae
 
cbd75ae
 $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
93572ea
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
93572ea
index cfcdf5d..67207cf 100644
93572ea
--- a/writerperfect/Library_wpftwriter.mk
93572ea
+++ b/writerperfect/Library_wpftwriter.mk
93572ea
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_static_libraries,wpftwriter,\
93572ea
 $(eval $(call gb_Library_use_externals,wpftwriter,\
93572ea
 	abw \
93572ea
 	boost_headers \
93572ea
-	ebook \
93572ea
 	etonyek \
93572ea
 	icui18n \
93572ea
 	icudata \
93572ea
@@ -66,7 +65,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
93572ea
 
93572ea
 $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
93572ea
 	writerperfect/source/writer/AbiWordImportFilter \
93572ea
-	writerperfect/source/writer/EBookImportFilter \
93572ea
 	writerperfect/source/writer/MSWorksImportFilter \
93572ea
 	writerperfect/source/writer/MWAWImportFilter \
93572ea
 	writerperfect/source/writer/WordPerfectImportFilter \
93572ea
diff --git a/writerperfect/source/writer/wpftwriter_genericfilter.cxx b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
93572ea
index 05f6542..831bc38 100644
93572ea
--- a/writerperfect/source/writer/wpftwriter_genericfilter.cxx
93572ea
+++ b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
93572ea
@@ -32,7 +32,6 @@
93572ea
 #include "sal/types.h"
93572ea
 
93572ea
 #include "AbiWordImportFilter.hxx"
93572ea
-#include "EBookImportFilter.hxx"
93572ea
 #include "WordPerfectImportFilter.hxx"
93572ea
 #include "MSWorksImportFilter.hxx"
93572ea
 #include "MWAWImportFilter.hxx"
93572ea
@@ -52,9 +51,6 @@ static cppu::ImplementationEntry const services[] = {
93572ea
     { &MWAWImportFilter_createInstance, &MWAWImportFilter_getImplementationName,
93572ea
       &MWAWImportFilter_getSupportedServiceNames,
93572ea
       &cppu::createSingleComponentFactory, 0, 0 },
93572ea
-    { &EBookImportFilter_createInstance, &EBookImportFilter_getImplementationName,
93572ea
-      &EBookImportFilter_getSupportedServiceNames,
93572ea
-      &cppu::createSingleComponentFactory, 0, 0 },
93572ea
     { 0, 0, 0, 0, 0, 0 } };
93572ea
 
93572ea
 }
93572ea
-- 
93572ea
1.9.3
93572ea