libvisio/UnpackedTarball_libvisio.mk | 4 ++++
libvisio/libvisio-0.0.30-msvc.patch.1 | 12 ++++++++++++
2 files changed, 16 insertions(+)
New commits:
commit 6180917f2d8280f643b14a69abdca79d91820f86
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Sat Jul 13 08:13:39 2013 +0200
Fix some runtime exceptions with msvc-built libvisio
The previous code was causing silent exceptions in some particular
cases. Passing through a temporary works well.
Change-Id: I71a9a58b98b5f392da4d8a4c8d08ddc1487ec79f
(cherry picked from commit ae9003af4c3942aa184b67c3cb7687f9dfc7dd5e)
Reviewed-on: https://gerrit.libreoffice.org/4878
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/libvisio/UnpackedTarball_libvisio.mk
b/libvisio/UnpackedTarball_libvisio.mk
index e4c0561..8b41f4a 100644
--- a/libvisio/UnpackedTarball_libvisio.mk
+++ b/libvisio/UnpackedTarball_libvisio.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
+ libvisio/libvisio-0.0.30-msvc.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.30-msvc.patch.1
b/libvisio/libvisio-0.0.30-msvc.patch.1
new file mode 100644
index 0000000..4483806
--- /dev/null
+++ b/libvisio/libvisio-0.0.30-msvc.patch.1
@@ -0,0 +1,12 @@
+--- a/src/lib/VSDContentCollector.cpp
++++ b/src/lib/VSDContentCollector.cpp
+@@ -655,7 +655,8 @@ void libvisio::VSDContentCollector::_flushText()
+ {
+ // Insert duplicate
+ std::vector<VSDCharStyle>::iterator charIt = m_charFormats.begin() +
charIndex;
+- m_charFormats.insert(charIt, m_charFormats[charIndex]);
++ VSDCharStyle tmpCharFormat = m_charFormats[charIndex];
++ m_charFormats.insert(charIt, tmpCharFormat);
+ m_charFormats[charIndex].charCount = paraCharCount;
+ m_charFormats[charIndex+1].charCount -= paraCharCount;
+ }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
