diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-25 12:27:25 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-25 12:55:23 +0100 |
| commit | 411bd6e440266a0db95907ad73a3a5be92bd1827 (patch) | |
| tree | f7e1cfdada2eebcc129b1c251042225cb219d74e /external/libodfgen | |
| parent | b625baafd00ce578f8e68206fd8c1dd1206da2fc (diff) | |
fdo#86664 VSDX import: handle metadata
Change-Id: I04a446e6b8a8352be9f091980bca31842bb7e643
Diffstat (limited to 'external/libodfgen')
| -rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk | 4 | ||||
| -rw-r--r-- | external/libodfgen/metadata.patch | 33 |
2 files changed, 37 insertions, 0 deletions
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index bb2153f5790a..edf41b6148eb 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -13,4 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0)) +$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ + external/libodfgen/metadata.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/metadata.patch b/external/libodfgen/metadata.patch new file mode 100644 index 000000000000..1b904ed8cfd8 --- /dev/null +++ b/external/libodfgen/metadata.patch @@ -0,0 +1,33 @@ +commit fb43d79e12ce132fc127cc0481ff5a6bdbcd1afe +Author: Miklos Vajna <vmiklos@collabora.co.uk> +Date: Tue Nov 25 11:26:34 2014 +0100 + + Od[gp]Generator: declare meta namespace + + Other generators had it already, and without this, it's not possible to + declare creation date. + +diff --git src/OdgGenerator.cxx src/OdgGenerator.cxx +index 6a2b1a4..ca4d4f0 100644 +--- src/OdgGenerator.cxx ++++ src/OdgGenerator.cxx +@@ -283,6 +283,7 @@ bool OdgGeneratorPrivate::writeTargetDocument(OdfDocumentHandler *pHandler, OdfS + docContentPropList.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); + docContentPropList.addAttribute("xmlns:table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0"); + docContentPropList.addAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink"); ++ docContentPropList.addAttribute("xmlns:meta", "urn:oasis:names:tc:opendocument:xmlns:meta:1.0"); + docContentPropList.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); + docContentPropList.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); + docContentPropList.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); +diff --git a/src/OdpGenerator.cxx b/src/OdpGenerator.cxx +index 4345c40..8ba4dc0 100644 +--- src/OdpGenerator.cxx ++++ src/OdpGenerator.cxx +@@ -444,6 +444,7 @@ bool OdpGeneratorPrivate::writeTargetDocument(OdfDocumentHandler *pHandler, OdfS + docContentPropList.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); + docContentPropList.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); + docContentPropList.addAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink"); ++ docContentPropList.addAttribute("xmlns:meta", "urn:oasis:names:tc:opendocument:xmlns:meta:1.0"); + // WARNING: this is not ODF! + docContentPropList.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); + docContentPropList.addAttribute("xmlns:officeooo", "http://openoffice.org/2009/office"); |