diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-30 08:48:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-30 15:35:44 +0100 |
| commit | 1a48cdaf91633b354fb1110c566c766a4398fba0 (patch) | |
| tree | 18973dc147cfd3f2d8276341593dca00c60e2723 /external/libepubgen | |
| parent | 56d79a2d046f08e703ed6498b7c8d15abe057d3a (diff) | |
EPUB export: allow overwriting of document metadata
Pick up overrides from <base directory>/<base name>.xmp as a start.
Change-Id: Ib64a6bbdadc53633fb1f0d4a7efdde2e3c96b5ef
Reviewed-on: https://gerrit.libreoffice.org/45551
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'external/libepubgen')
| -rw-r--r-- | external/libepubgen/libepubgen-epub3.patch.1 | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/external/libepubgen/libepubgen-epub3.patch.1 b/external/libepubgen/libepubgen-epub3.patch.1 index af87b2644e8d..39bac59c51ff 100644 --- a/external/libepubgen/libepubgen-epub3.patch.1 +++ b/external/libepubgen/libepubgen-epub3.patch.1 @@ -4467,3 +4467,33 @@ index 3f4bf3c..cbb83b7 100644 -- 2.13.6 +From 631b21834883aa8f2ee83a20717dd37900331696 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna <vmiklos@collabora.co.uk> +Date: Tue, 21 Nov 2017 11:52:03 +0100 +Subject: [PATCH] EPUBGenerator: allow overwriting dc:identifier default + +All other types had a way to be overwritten. +--- + src/lib/EPUBGenerator.cpp | 5 ++++- + src/test/EPUBTextGeneratorTest.cpp | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp +index 62dac6e..1cb1112 100644 +--- a/src/lib/EPUBGenerator.cpp ++++ b/src/lib/EPUBGenerator.cpp +@@ -285,7 +285,10 @@ void EPUBGenerator::writeRoot() + boost::uuids::uuid uuid = boost::uuids::random_generator()(); + identifierStream << uuid; + std::string identifierCharactrs = identifierStream.str(); +- sink.insertCharacters(identifierCharactrs.c_str()); ++ RVNGString identifier = identifierCharactrs.c_str(); ++ if (m_metadata["dc:identifier"] && !m_metadata["dc:identifier"]->getStr().empty()) ++ identifier = m_metadata["dc:identifier"]->getStr(); ++ sink.insertCharacters(identifier); + sink.closeElement("dc:identifier"); + + RVNGString title("Unknown Title"); +-- +2.13.6 + |