diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-10-17 10:32:41 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-10-17 12:32:38 +0200 |
| commit | 0f50f4d91809c65b50da087a84fb7b8722fda3f9 (patch) | |
| tree | 35d9fc18ca4fd6b1ae3df29ee300a3adb034845b /external/libepubgen | |
| parent | tdf#104079 RTF import: fix handling fields inside TOC fields (diff) | |
| download | core-0f50f4d91809c65b50da087a84fb7b8722fda3f9.tar.gz core-0f50f4d91809c65b50da087a84fb7b8722fda3f9.zip | |
EPUB export: ignore underline type/style 'none'
This is similar to commit ebf34ec31fb441d6226075a51f5f83ebf4668082 (EPUB
export: ignore line though type/style 'none', 2017-09-11), but this time
for underline.
Change-Id: I806f64cc59e8cd8ab944500256755c18ed3d1249
Reviewed-on: https://gerrit.libreoffice.org/43449
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external/libepubgen')
| -rw-r--r-- | external/libepubgen/libepubgen-epub3.patch.1 | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/external/libepubgen/libepubgen-epub3.patch.1 b/external/libepubgen/libepubgen-epub3.patch.1 index d1d1af2333f6..95ad47038ba9 100644 --- a/external/libepubgen/libepubgen-epub3.patch.1 +++ b/external/libepubgen/libepubgen-epub3.patch.1 @@ -2383,3 +2383,39 @@ index 07aa50d..26675af 100644 -- 2.12.3 +From 4f46bc715a5fc8a0e13bb1596f6f5dbb55ca0632 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna <vmiklos@collabora.co.uk> +Date: Tue, 17 Oct 2017 10:22:35 +0200 +Subject: [PATCH] EPUBSpanStyleManager: ignore underline type/style 'none' + +This is similar to commit 7be89d1881e175182039ca93a1546d79933cab85 +(EPUBSpanStyleManager: ignore line though type/style 'none', +2017-09-11). +--- + src/lib/EPUBSpanStyleManager.cpp | 9 ++++++++- + src/test/EPUBTextGeneratorTest.cpp | 22 ++++++++++++++++++++++ + 2 files changed, 30 insertions(+), 1 deletion(-) + +diff --git a/src/lib/EPUBSpanStyleManager.cpp b/src/lib/EPUBSpanStyleManager.cpp +index 5e53ee2..e25fa26 100644 +--- a/src/lib/EPUBSpanStyleManager.cpp ++++ b/src/lib/EPUBSpanStyleManager.cpp +@@ -161,7 +161,14 @@ void EPUBSpanStyleManager::extractDecorations(RVNGPropertyList const &pList, EPU + + if (pList["style:text-overline-style"] || pList["style:text-overline-type"]) + s << " overline"; +- if (pList["style:text-underline-style"] || pList["style:text-underline-type"]) ++ const librevenge::RVNGProperty *textUnderlineStyle = pList["style:text-underline-style"]; ++ bool underline = textUnderlineStyle && textUnderlineStyle->getStr() != "none"; ++ if (!underline) ++ { ++ const librevenge::RVNGProperty *textUnderlineType = pList["style:text-underline-type"]; ++ underline = textUnderlineType && textUnderlineType->getStr() != "none"; ++ } ++ if (underline) + s << " underline"; + if (s.str().length()) + cssProps["text-decoration"] = s.str(); +-- +2.12.3 + |