[Libreoffice-commits] core.git: solenv/gdb

[Michael Stahl]

 solenv/gdb/libreoffice/sw.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4f743419a04375160437a910254c45dea396f70d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 28 18:08:03 2017 +0200

    gdb pretty-printers: fix BigPtrArrayPrinter after recent std::isation
    
    Change-Id: Ie98f080fbb0efb807dcb2fb7893811f68e831a8f

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index cfb3cec3eeb7..031963f5c789 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -194,10 +194,10 @@ class BigPtrArrayPrinter(object):
     class _iterator(six.Iterator):
 
         def __init__(self, array):
-            self.blocks = array['m_ppInf']
+            self.blocks = array['m_vpInf']['_M_impl']['_M_start']
             self.count = array['m_nSize']
             self.pos = 0
-            self.block_count = array['m_nBlock']
+            self.block_count = array['m_vpInf']['_M_impl']['_M_finish'] - array['m_vpInf']['_M_impl']['_M_start']
             self.block_pos = 0
             self.block = None
             self.indent = ""
@@ -246,7 +246,7 @@ class BigPtrArrayPrinter(object):
                 raise StopIteration()
 
             name = str(self.pos)
-            node = self.block['pData'][self.pos - self.block['nStart']]
+            node = self.block['mvData']['_M_elems'][self.pos - self.block['nStart']]
             value =  self._node_value(node)
             if self.pos == self.block['nEnd']:
                 self._next_block()