EPUB export: allow setting custom media dir explicitly

The default is the same <base directory>/<base name>/ as before.

Change-Id: Idb500193a7f6bd901d861e857147832a3ada91d3
Reviewed-on: https://gerrit.libreoffice.org/45602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

3 files changed, 23 insertions, 0 deletions

diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx
index 1f7b64250724..335347de60ff 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -90,6 +90,7 @@ public:
     void testImageLink();
     void testFootnote();
     void testPopup();
+    void testPopupAPI();
 
     CPPUNIT_TEST_SUITE(EPUBExportTest);
     CPPUNIT_TEST(testOutlineLevel);
@@ -128,6 +129,7 @@ public:
     CPPUNIT_TEST(testImageLink);
     CPPUNIT_TEST(testFootnote);
     CPPUNIT_TEST(testPopup);
+    CPPUNIT_TEST(testPopupAPI);
     CPPUNIT_TEST_SUITE_END();
 };
 
@@ -724,6 +726,27 @@ void EPUBExportTest::testPopup()
     assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[2]/xhtml:img", 1);
 }
 
+void EPUBExportTest::testPopupAPI()
+{
+    // Make sure that the popup works with data from a media directory.
+    OUString aMediaDir = m_directories.getURLFromSrc(DATA_DIRECTORY) + "popup";
+    uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence(
+    {
+        {"RVNGMediaDir", uno::makeAny(aMediaDir)}
+    }));
+    createDoc("popup-api.odt", aFilterData);
+
+    // We have a non-empty anchor image.
+    mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+    OUString aAnchor = getXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a/xhtml:img", "src");
+    CPPUNIT_ASSERT(!aAnchor.isEmpty());
+    // We have a non-empty popup image.
+    OUString aData = getXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[1]/xhtml:img", "src");
+    CPPUNIT_ASSERT(!aData.isEmpty());
+    // The anchor is different from the popup image.
+    CPPUNIT_ASSERT(aAnchor != aData);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest);
 
 }
diff --git a/writerperfect/qa/unit/data/writer/epubexport/popup-api.odt b/writerperfect/qa/unit/data/writer/epubexport/popup-api.odt
new file mode 100644
index 000000000000..30f4cc8f526e
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/epubexport/popup-api.odt
diff --git a/writerperfect/qa/unit/data/writer/epubexport/popup/libreoffice.png b/writerperfect/qa/unit/data/writer/epubexport/popup/libreoffice.png
index fdad35484e7c..cc74f136fbdf 100644
--- a/writerperfect/qa/unit/data/writer/epubexport/popup/libreoffice.png
+++ b/writerperfect/qa/unit/data/writer/epubexport/popup/libreoffice.png