summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2016-09-09 20:09:37 -0400
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-09-16 03:06:39 +0000
commit5588b4fbf7580d2d2ce1fd4441a997d549767ccb (patch)
tree6988ef0d96c3e4417a23447f225666929a5dc433 /external
parent8fd90910bc1da3a0c91baeeed9cebbd56097d0ce (diff)
Upgrade mdds to 1.2.2.
This version contains one critical bugfix, which will probably fix the following two: http://crashreport.libreoffice.org/stats/crash_details/62f488c8-1c0e-4ac5-8651-16724b440bf8 http://crashreport.libreoffice.org/stats/crash_details/298fd7a9-b0ab-46d2-816e-5aafb3b3be8e Change-Id: I5a26cea7f9293b5ed3026996a05ab8a3a671c38b Reviewed-on: https://gerrit.libreoffice.org/28794 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-on: https://gerrit.libreoffice.org/28851 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'external')
-rw-r--r--external/mdds/UnpackedTarball_mdds.mk1
-rw-r--r--external/mdds/tdf90579.patch.023
2 files changed, 0 insertions, 24 deletions
diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
index bd57593e7d45..c015f4c13f5a 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
- external/mdds/tdf90579.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mdds/tdf90579.patch.0 b/external/mdds/tdf90579.patch.0
deleted file mode 100644
index 5ef1bc74097d..000000000000
--- a/external/mdds/tdf90579.patch.0
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
-index 0e2a15a..fe9c767 100644
---- include/mdds/multi_type_vector_def.inl
-+++ include/mdds/multi_type_vector_def.inl
-@@ -2306,6 +2306,9 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::swap_single_to_multi_blocks(
- {
- // Source range is at the top of a block.
-
-+ // Shrink the current block by erasing the top part.
-+ element_block_func::erase(*blk_src->mp_data, 0, len);
-+
- if (src_tail_len == 0)
- {
- // the whole block needs to be replaced.
-@@ -2314,8 +2317,6 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::swap_single_to_multi_blocks(
- }
- else
- {
-- // Shrink the current block by erasing the top part.
-- element_block_func::erase(*blk_src->mp_data, 0, len);
- blk_src->m_size -= len;
- }
-