[Libreoffice-commits] core.git: mdds/0001-Fix-it-here-too.patch mdds/UnpackedTarball_mdds.mk

[Kohei Yoshida]

 mdds/0001-Fix-it-here-too.patch |   26 ++++++++++++++++++++++++++
 mdds/UnpackedTarball_mdds.mk    |    1 +
 2 files changed, 27 insertions(+)

New commits:
commit bc120d18144a78d42f9bbb017133e1da92e004ef
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Jun 25 09:43:54 2013 -0400

    Another place where the same fix needs to be applied.
    
    Change-Id: I2d54fa4c39c28b815a051977715e1db672156957

diff --git a/mdds/0001-Fix-it-here-too.patch b/mdds/0001-Fix-it-here-too.patch
new file mode 100644
index 0000000..9884ff0
--- /dev/null
+++ b/mdds/0001-Fix-it-here-too.patch
@@ -0,0 +1,26 @@
+From e9fdebe0cad9277cfed994cae7fe9d08efbb4ba8 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at gmail.com>
+Date: Tue, 25 Jun 2013 09:42:19 -0400
+Subject: [PATCH] Fix it here too.
+
+---
+ 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 685899b..cea8ae0 100644
+--- a/include/mdds/multi_type_vector_def.inl
++++ b/c/d/include/mdds/multi_type_vector_def.inl
+@@ -1829,8 +1829,7 @@ void multi_type_vector<_CellBlockFunc>::swap_single_blocks(
+         }
+         else
+         {
+-            m_blocks.insert(m_blocks.begin()+block_index+1, NULL);
+-            m_blocks[block_index+1] = new block(len);
++            m_blocks.insert(m_blocks.begin()+block_index+1, new block(len));
+             block* blk = m_blocks[block_index+1];
+             blk->mp_data = dst_data.release();
+         }
+-- 
+1.8.0
+
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index bbad2dd..9d85d74 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -17,6 +17,7 @@ $(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 \
+	mdds/0001-Fix-it-here-too.patch \
 ))
 
 # vim: set noet sw=4 ts=4: