From 8f0f8f80c1712fdc2ebb178cb88c5bd43db50fb7 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Nov 2017 16:31:18 +0100 Subject: EPUB export: don't loose images with links And actually handle the link around the image. Change-Id: Ic9b7b9497becf677dbf550c67074c5c588ef8922 --- writerperfect/qa/unit/EPUBExportTest.cxx | 11 ++++ .../qa/unit/data/writer/epubexport/image-link.fodt | 37 ++++++++++++ writerperfect/source/writer/exp/txtparai.cxx | 68 ++++++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 writerperfect/qa/unit/data/writer/epubexport/image-link.fodt (limited to 'writerperfect') diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index 1760caa05096..d04c2eeeaaa3 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -87,6 +87,7 @@ public: void testTableWidth(); void testTextBox(); void testFontEmbedding(); + void testImageLink(); CPPUNIT_TEST_SUITE(EPUBExportTest); CPPUNIT_TEST(testOutlineLevel); @@ -122,6 +123,7 @@ public: CPPUNIT_TEST(testTableWidth); CPPUNIT_TEST(testTextBox); CPPUNIT_TEST(testFontEmbedding); + CPPUNIT_TEST(testImageLink); CPPUNIT_TEST_SUITE_END(); }; @@ -679,6 +681,15 @@ void EPUBExportTest::testFontEmbedding() #endif } +void EPUBExportTest::testImageLink() +{ + createDoc("image-link.fodt", {}); + + mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); + // This failed, image was missing. + assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:img", 1); +} + CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest); } diff --git a/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt b/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt new file mode 100644 index 000000000000..9414e36fd723 --- /dev/null +++ b/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAQAAAAAYLlVAAAABGdBTUEAALGPC/xhBQAAAAFz + UkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAA + AAJiS0dEAACqjSMyAAAACW9GRnMAAAAGAAAAAAAMc1XTAAAACXBIWXMAAA3XAAAN1wFCKJt4 + AAAACXZwQWcAAABMAAAAQACdMTgbAAABzUlEQVRo3u3ZPU/CQBjA8X+Jxs3ESUDj4iK+LA5+ + BBfjqBE1cXB2MlFAEqMgxvhNNL4sLsK3UPQL6ObkoAETz+FKW2mxCPRYnucWUu76/OC59C49 + cGOCKqrD9kHRc6ddPv7oW2WCwMh0nF63Myz7Tm8hPTNu0pgHMER3scepTbgK6enJNND83RLn + /878yRaPmgBZFDuMsNLeWB9gmFQHP77MIg9gsYciR50NFKvtjIy10yk84pSZA7DYpwR8scmF + QQCMuoQMpzbh0iAARrlnVn90CWHTsZcAiHPPdINQAuqsc2MQAAnKDUKWEhZ10twaBEDSJWQo + YlFj7S9CzwEegkXWIbQsRAQASFJhpplwbRAACS+hANRJBxMiAkDcJeQ4sQkBhYgMoJ+Ozlwo + 2YQ7AJ6CRxyiUGnVy3hVKb0Af9v7hUG2Wy9TEQCUelFTDULB2S+YKYGOMcpM6UIccOQnRA6A + cSp6ibfI+wkGADBGpTEd8xz1AaAfTQ7huA8AvUw5hVjuA0D/C5OaMN8XACRZ8F0zCggKAQhA + AAIQgAAEIAABCEAAAhCAAAQgAAH4zg3feY4w3Xs44M5+oW0qvCWoGcvaIlM3x/f/ab+O738A + hOCNQr34oD4AAAAldEVYdGNyZWF0ZS1kYXRlADIwMTAtMTItMjBUMTc6MDg6MzYrMDE6MDB6 + 5RscAAAAJXRFWHRtb2RpZnktZGF0ZQAyMDEwLTEyLTIwVDE3OjA4OjM3KzAxOjAwgyNmnAAA + AABJRU5ErkJggg== + + + + diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx index b1359953e325..a7d899547759 100644 --- a/writerperfect/source/writer/exp/txtparai.cxx +++ b/writerperfect/source/writer/exp/txtparai.cxx @@ -223,6 +223,72 @@ void XMLTabContext::startElement(const OUString &/*rName*/, const css::uno::Refe mrImport.GetGenerator().closeSpan(); } +/// Handler for . +class XMLTextFrameHyperlinkContext : public XMLImportContext +{ +public: + XMLTextFrameHyperlinkContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList); + rtl::Reference CreateChildContext(const OUString &rName, const css::uno::Reference &xAttribs) override; + + void SAL_CALL startElement(const OUString &rName, const css::uno::Reference &xAttribs) override; + void SAL_CALL endElement(const OUString &rName) override; + void SAL_CALL characters(const OUString &rChars) override; + +private: + librevenge::RVNGPropertyList m_aPropertyList; +}; + +XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList) + : XMLImportContext(rImport) +{ + // Inherit properties from parent. + librevenge::RVNGPropertyList::Iter itProp(rPropertyList); + for (itProp.rewind(); itProp.next();) + m_aPropertyList.insert(itProp.key(), itProp()->clone()); +} + +rtl::Reference XMLTextFrameHyperlinkContext::CreateChildContext(const OUString &rName, const css::uno::Reference &/*xAttribs*/) +{ + return CreateParagraphOrSpanChildContext(mrImport, rName, m_aPropertyList); +} + +void XMLTextFrameHyperlinkContext::startElement(const OUString &/*rName*/, const css::uno::Reference &xAttribs) +{ + librevenge::RVNGPropertyList aPropertyList; + for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i) + { + const OUString &rAttributeName = xAttribs->getNameByIndex(i); + const OUString &rAttributeValue = xAttribs->getValueByIndex(i); + if (rAttributeName == "text:style-name") + // This affects the nested span's properties. + FillStyles(rAttributeValue, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(), m_aPropertyList); + else + { + // This affects the link's properties. + OString sName = OUStringToOString(rAttributeName, RTL_TEXTENCODING_UTF8); + OString sValue = OUStringToOString(rAttributeValue, RTL_TEXTENCODING_UTF8); + aPropertyList.insert(sName.getStr(), sValue.getStr()); + } + } + + mrImport.GetGenerator().openLink(aPropertyList); +} + +void XMLTextFrameHyperlinkContext::endElement(const OUString &/*rName*/) +{ + mrImport.GetGenerator().closeLink(); +} + +void XMLTextFrameHyperlinkContext::characters(const OUString &rChars) +{ + mrImport.GetGenerator().openSpan(m_aPropertyList); + + OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8); + mrImport.GetGenerator().insertText(librevenge::RVNGString(sCharU8.getStr())); + + mrImport.GetGenerator().closeSpan(); +} + /// Handler for . class XMLHyperlinkContext : public XMLImportContext { @@ -298,6 +364,8 @@ rtl::Reference XMLParaContext::CreateChildContext(const OUStri { if (rName == "text:a") return new XMLHyperlinkContext(mrImport, m_aTextPropertyList); + if (rName == "draw:a") + return new XMLTextFrameHyperlinkContext(mrImport, m_aTextPropertyList); return CreateParagraphOrSpanChildContext(mrImport, rName, m_aTextPropertyList); } -- cgit