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

[Michael Stahl]

 solenv/gdb/libreoffice/sw.py |   25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

New commits:
commit b23c022db83fa74774063456fc626ffad1f3c115
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 20 12:30:23 2016 +0100

    gdb pretty printers: fix the SwXTextCursor::Impl one even more
    
    Turns out that commit 30f3315d52df22716c086836c41465a6c4cb98b5 has
    removed the SwClient there a long time ago, and the SwUnoCrsr was also
    renamed...
    
    Change-Id: I92932130c5adbea530c39557932efce70c9f75e7

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index ff929bb..cfb3cec 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -70,8 +70,10 @@ class SwPaMPrinter(object):
             children.append(("prev", prev))
         return children.__iter__()
 
-class SwUnoCrsrPrinter(SwPaMPrinter):
-    '''Prints SwUnoCrsr.'''
+# apparently the purpose of this is to suppress printing all the extra members
+# that SwCursor and SwUnoCursor add
+class SwUnoCursorPrinter(SwPaMPrinter):
+    '''Prints SwUnoCursor.'''
 
 class SwRectPrinter(object):
     '''Prints SwRect.'''
@@ -130,8 +132,9 @@ class SwXTextCursorImplPrinter(object):
         return "%s" % (self.typename)
 
     def children(self):
-        registeredIn = self.value['m_pRegisteredIn'].dereference()
-        children = [('registeredIn', registeredIn)]
+        cursor = self.value['m_pUnoCursor']["m_pCursor"]["_M_ptr"]
+        registeredIn = cursor.dereference()
+        children = [('m_pUnoCursor', registeredIn)]
         return children.__iter__()
 
 class SwUnoImplPtrPrinter(object):
@@ -289,7 +292,7 @@ def build_pretty_printers():
     printer.add('SwNodeIndex', SwNodeIndexPrinter)
     printer.add('SwIndex', SwIndexPrinter)
     printer.add('SwPaM', SwPaMPrinter)
-    printer.add('SwUnoCrsr', SwUnoCrsrPrinter)
+    printer.add('SwUnoCursor', SwUnoCursorPrinter)
     printer.add('SwRect', SwRectPrinter)
     printer.add('sw::mark::Bookmark', MarkBasePrinter)
     printer.add('sw::mark::MarkBase', MarkBasePrinter)
commit 04e3b4789682ecc1ead40b35dcc13b5079f51460
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 20 11:11:10 2016 +0100

    gdb pretty printers: fix BigPtrArray printer for member rename
    
    Change-Id: Ia9da0c0931a01b2c99c24420a9ba603b47a711c1

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index cb70fbc..ff929bb 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -175,7 +175,7 @@ class BigPtrArrayPrinter(object):
         self.value = value
 
     def to_string(self):
-        length = self.value['nSize']
+        length = self.value['m_nSize']
         if length > 0:
             return "%s of length %d" % (self.typename, length)
         else:
@@ -191,10 +191,10 @@ class BigPtrArrayPrinter(object):
     class _iterator(six.Iterator):
 
         def __init__(self, array):
-            self.blocks = array['ppInf']
-            self.count = array['nSize']
+            self.blocks = array['m_ppInf']
+            self.count = array['m_nSize']
             self.pos = 0
-            self.block_count = array['nBlock']
+            self.block_count = array['m_nBlock']
             self.block_pos = 0
             self.block = None
             self.indent = ""
commit 40317fb643997053f30cc2cfc41e3c0a819079c2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 20 10:56:08 2016 +0100

    gdb pretty printers: fix SwXTextCursor::Impl printer for SwClient rename
    
    Change-Id: Ief136f57ce60bde1faa0603961aa775967621fbf

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index ac6cb8e..cb70fbc 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -130,7 +130,7 @@ class SwXTextCursorImplPrinter(object):
         return "%s" % (self.typename)
 
     def children(self):
-        registeredIn = self.value['pRegisteredIn'].dereference()
+        registeredIn = self.value['m_pRegisteredIn'].dereference()
         children = [('registeredIn', registeredIn)]
         return children.__iter__()
 
commit 96ecc57bc781596ce9c419e3452324a301a1720f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 20 10:46:46 2016 +0100

    gdb pretty printers: fix SwPaM printer for Ring member renaming
    
    Change-Id: I605e4e972468165e7f5d21681b6e7eeb228dfdc9

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index 88b8a9b..ac6cb8e 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -59,8 +59,8 @@ class SwPaMPrinter(object):
         return "%s" % (self.typename)
 
     def children(self):
-        next_ = self.value['pNext']
-        prev  = self.value['pPrev']
+        next_ = self.value['m_pNext']
+        prev  = self.value['m_pPrev']
         point = self.value['m_pPoint'].dereference()
         mark = self.value['m_pMark'].dereference()
         children = [ ( 'point', point), ( 'mark', mark ) ]