[Libreoffice-commits] core.git: mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch mdds/UnpackedTarball_mdds.mk

[Kohei Yoshida]

 mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch |   27 ++++++++++
 mdds/UnpackedTarball_mdds.mk                                         |    1 
 2 files changed, 28 insertions(+)

New commits:
commit 92e6db6c98b06bffbe7be856ee16ee68f5f901c5
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Jun 25 08:19:37 2013 -0400

    Try to help the Windows tinderbox.
    
    Change-Id: Ia3c6df80ff26ea00e91dd97841c4867bf0a55705

diff --git a/mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch b/mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch
new file mode 100644
index 0000000..783210d
--- /dev/null
+++ b/mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch
@@ -0,0 +1,27 @@
+From a2a1c432f65c0612bb6f1c23a50bd41d2cf0cbdd Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at gmail.com>
+Date: Tue, 25 Jun 2013 08:08:09 -0400
+Subject: [PATCH] Combine these two calls. There is no reason why they have to
+ separate.
+
+---
+ include/mdds/multi_type_vector_def.inl | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
+index 36dde5e..685899b 100644
+--- a/include/mdds/multi_type_vector_def.inl
++++ b/c/d/include/mdds/multi_type_vector_def.inl
+@@ -1801,8 +1801,7 @@ void multi_type_vector<_CellBlockFunc>::swap_single_blocks(
+         else
+         {
+             // Insert a new block to store the new elements.
+-            m_blocks.insert(m_blocks.begin()+block_index, NULL);
+-            m_blocks[block_index] = new block(len);
++            m_blocks.insert(m_blocks.begin()+block_index, new block(len));
+             block* blk = m_blocks[block_index];
+             blk->mp_data = dst_data.release();
+         }
+-- 
+1.8.0
+
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index 69fbf18..bbad2dd 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
 	mdds/mdds_0.6.0.patch \
 	mdds/0001-Workaround-for-an-old-gcc-bug.patch \
+	mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch \
 ))
 
 # vim: set noet sw=4 ts=4: