summaryrefslogtreecommitdiff
path: root/writerperfect
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-02-12 16:08:41 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-02-12 21:04:12 +0100
commit6259dfce9d140368156c5fe8bb577c7589265dd5 (patch)
treeecaffad630d929eafad1ceab51a0368c4aa28ab2 /writerperfect
parenta3cd6c70af6979e4608b180f868313dbee548d5a (diff)
EPUB export: pick up XMP metadata from 'metadata.xmp'
This used to be <filename>.xmp, but that's inconsistent with how cover image is not <filename>.jpg but cover.jpg (or .png, etc). Also it was redundant, since these files are in the media directory, for which the default is the <filename> directory. Change-Id: Iadfebf2f9c336f443537759b1e58409a93e1c51d Reviewed-on: https://gerrit.libreoffice.org/49604 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerperfect')
-rw-r--r--writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp (renamed from writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp)0
-rw-r--r--writerperfect/source/writer/exp/xmlimp.cxx3
2 files changed, 1 insertions, 2 deletions
diff --git a/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp b/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp
index aa578159cb89..aa578159cb89 100644
--- a/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp
+++ b/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 3ef02f69f008..812b27e7b69b 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -183,8 +183,7 @@ void FindXMPMetadata(const uno::Reference<uno::XComponentContext> &xContext, con
return;
OUString aMediaDir = FindMediaDir(rDocumentBaseURL, rFilterData);
- INetURLObject aDocumentBaseURL(rDocumentBaseURL);
- OUString aURL = aMediaDir + aDocumentBaseURL.GetBase() + ".xmp";
+ OUString aURL = aMediaDir + "metadata.xmp";
SvFileStream aStream(aURL, StreamMode::READ);
if (!aStream.IsOpen())
return;