diff options
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | external/mdds/UnpackedTarball_mdds.mk | 1 | ||||
| -rw-r--r-- | external/mdds/use-position-hint-also-back.patch | 50 |
3 files changed, 1 insertions, 52 deletions
diff --git a/download.lst b/download.lst index 59b58f96347c..046b440cd379 100644 --- a/download.lst +++ b/download.lst @@ -168,7 +168,7 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a export LXML_TARBALL := lxml-4.1.1.tgz export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz -export MDDS_SHA256SUM := 74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7 +export MDDS_SHA256SUM := 144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d export MDDS_TARBALL := mdds-1.5.0.tar.bz2 export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk index 625204d29619..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/use-position-hint-also-back.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mdds/use-position-hint-also-back.patch b/external/mdds/use-position-hint-also-back.patch deleted file mode 100644 index 0b38c38d5536..000000000000 --- a/external/mdds/use-position-hint-also-back.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 726e2f02d14833bde2f7eef9677f5564c485a992 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@centrum.cz> -Date: Fri, 17 May 2019 13:55:20 +0200 -Subject: [PATCH] use position hint also when it is past the actual position - -The m_blocks data structure is a vector. It means that it can be -also walked back, instead of resetting and starting from the very -start. - -Allows a noticeable performance improvement in -https://gerrit.libreoffice.org/#/c/72424/ . ---- - include/mdds/multi_type_vector_def.inl | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl -index 22a0ee2..09894e6 100644 ---- include/mdds/multi_type_vector_def.inl -+++ include/mdds/multi_type_vector_def.inl -@@ -861,7 +861,26 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::get_block_position( - - if (pos < start_row) - { -- // Position hint is past the insertion position. Reset. -+ // Position hint is past the insertion position. -+ // Walk back if that seems efficient. -+ if (pos > start_row / 2) -+ { -+ for (size_type i = block_index; i > 0;) -+ { -+ --i; -+ const block& blk = m_blocks[i]; -+ start_row -= blk.m_size; -+ if (pos >= start_row) -+ { -+ // Row is in this block. -+ block_index = i; -+ return; -+ } -+ // Specified row is not in this block. -+ } -+ assert(start_row == 0); -+ } -+ // Otherwise reset. - start_row = 0; - block_index = 0; - } --- -2.16.4 - |