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