summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2014-01-14 11:28:57 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2014-01-14 11:29:19 +0100
commit7c3ca696543d0e9d6771d53f386086086d8b8643 (patch)
treee9e96af1e9f0bde32fa0bff56996832a30a179b9 /external
parent7c1415e06ff480c5df75db2451ea522b0150f9b2 (diff)
Fix ABW embedded images
Change-Id: Ifd33ea9c1f91865d5ae5175eefa9b65107404bf0
Diffstat (limited to 'external')
-rw-r--r--external/libabw/UnpackedTarball_libabw.mk1
-rw-r--r--external/libabw/libabw-0.0.0-mimetype.patch.113
2 files changed, 14 insertions, 0 deletions
diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk
index d6b72e19408d..843100ce1d28 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
external/libabw/libabw-0.0.0-footendnote.patch.1 \
external/libabw/libabw-0.0.0-listshape.patch.1 \
+ external/libabw/libabw-0.0.0-mimetype.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.0-mimetype.patch.1 b/external/libabw/libabw-0.0.0-mimetype.patch.1
new file mode 100644
index 000000000000..3856e315c1bb
--- /dev/null
+++ b/external/libabw/libabw-0.0.0-mimetype.patch.1
@@ -0,0 +1,13 @@
+diff --git a/src/lib/ABWContentCollector.cpp b/src/lib/ABWContentCollector.cpp
+index 53b8d81..14dd840 100644
+--- a/src/lib/ABWContentCollector.cpp
++++ b/src/lib/ABWContentCollector.cpp
+@@ -1537,7 +1537,7 @@ void libabw::ABWContentCollector::insertImage(const char *dataid, const char *pr
+ m_outputElements.addOpenFrame(propList);
+
+ propList.clear();
+- propList.insert("libwpd:mime-type", iter->second.m_mimeType);
++ propList.insert("libwpd:mimetype", iter->second.m_mimeType);
+
+ m_outputElements.addInsertBinaryObject(propList, iter->second.m_binaryData);
+