writerperfect/source/writer/exp/xmlimp.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 6259dfce9d140368156c5fe8bb577c7589265dd5
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Feb 12 16:08:41 2018 +0100
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 <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
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
similarity index 100%
rename from writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp
rename to 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
