diff options
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/Module_writerperfect.mk | 2 | ||||
| -rw-r--r-- | writerperfect/source/writer/EPUBExportFilter.cxx | 24 |
2 files changed, 4 insertions, 22 deletions
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 01f8a0dc5e59..6fa274bc8ce5 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_check_targets,writerperfect,\ $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\ CppunitTest_writerperfect_calc \ CppunitTest_writerperfect_draw \ - $(if $(SYSTEM_EPUBGEN),,CppunitTest_writerperfect_epubexport) \ + CppunitTest_writerperfect_epubexport \ CppunitTest_writerperfect_import \ CppunitTest_writerperfect_impress \ CppunitTest_writerperfect_writer \ diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx b/writerperfect/source/writer/EPUBExportFilter.cxx index 1b0eea21725c..3ef5384a8b96 100644 --- a/writerperfect/source/writer/EPUBExportFilter.cxx +++ b/writerperfect/source/writer/EPUBExportFilter.cxx @@ -9,8 +9,6 @@ #include "EPUBExportFilter.hxx" -#include <config_libepubgen.h> - #include <libepubgen/EPUBTextGenerator.h> #include <libepubgen/libepubgen-decls.h> @@ -25,17 +23,6 @@ using namespace com::sun::star; -#if !LIBEPUBGEN_VERSION_SUPPORT -namespace libepubgen -{ -enum EPUBStylesMethod -{ - EPUB_STYLES_METHOD_CSS, //< The styles will be described in a separate CSS file. - EPUB_STYLES_METHOD_INLINE, //< The styles will be described inline. -}; -} -#endif - namespace writerperfect { @@ -88,14 +75,9 @@ sal_Bool EPUBExportFilter::filter(const uno::Sequence<beans::PropertyValue> &rDe // file, the flat ODF filter has access to the doc model, everything else // is in-between. EPUBPackage aPackage(mxContext, rDescriptor); - libepubgen::EPUBTextGenerator aGenerator(&aPackage, static_cast<libepubgen::EPUBSplitMethod>(nSplitMethod) -#if LIBEPUBGEN_VERSION_SUPPORT - , nVersion -#endif - ); -#if LIBEPUBGEN_VERSION_SUPPORT - aGenerator.setStylesMethod(static_cast<libepubgen::EPUBStylesMethod>(nStylesMethod)); -#endif + libepubgen::EPUBTextGenerator aGenerator(&aPackage, nVersion); + aGenerator.setOption(libepubgen::EPUB_GENERATOR_OPTION_SPLIT, nSplitMethod); + aGenerator.setOption(libepubgen::EPUB_GENERATOR_OPTION_STYLES, nStylesMethod); uno::Reference<xml::sax::XDocumentHandler> xExportHandler(new exp::XMLImport(aGenerator)); uno::Reference<lang::XInitialization> xInitialization(mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.comp.Writer.XMLOasisExporter", mxContext), uno::UNO_QUERY); |