summaryrefslogtreecommitdiff
path: root/external/mdds
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2016-06-23 22:42:48 -0400
committerCaolán McNamara <caolanm@redhat.com>2016-06-24 15:05:43 +0000
commit81db0773fe499fd4b326925dad42a7099f19fcb3 (patch)
treefec8bd8db7db415ab84093619401f797a167d60e /external/mdds
parent58362bfda5e3eda4e91f0ad5a565670882bb18bb (diff)
Upgrade mdds to 1.2.1.
Change-Id: Ifc5b9d94bad191c0e19d5e6dada492caeb9cba76 Reviewed-on: https://gerrit.libreoffice.org/26638 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/mdds')
-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;
- }
-