diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-13 10:54:27 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-12-14 16:11:30 +0100 |
| commit | e8eecbcaaead516127497483958028fb58f8924f (patch) | |
| tree | dd06b051c390b1b0e3a5f33c6b7b7cb679f25cdb /writerperfect | |
| parent | 8582e9a837eb5bcf69ea5f82611e4a8cc3e67b98 (diff) | |
external: upload libepubgen-0.1.0
The only change is that version support is now available
unconditionally, otherwise most code changes were bundled already in the
form of patches.
(cherry picked from commits b2b1debf06589bd91e437df47a2904574aaae316 and
14c91e12b5bb3444235e1444eeefab42e21e3cb5)
Conflicts:
configure.ac
external/libepubgen/libepubgen-epub3.patch.1
writerperfect/source/writer/EPUBExportDialog.cxx
writerperfect/source/writer/EPUBExportFilter.cxx
Change-Id: I0e456d85c9d84002cabcd77b31b02c9a7ad16ac5
Reviewed-on: https://gerrit.libreoffice.org/46440
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
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); |