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

New commits:
commit 03714397c8a657a3ac451cc42ffc7578c567d081
Author:     Michael Stahl <[email protected]>
AuthorDate: Fri Sep 23 17:35:42 2022 +0200
Commit:     Noel Grandin <[email protected]>
CommitDate: Sat Sep 24 13:40:53 2022 +0200

    solenv: gdb: unbreak MarkBasePrinter
    
    (regression from commit b1cefa026d52fad4557d10c721fe9d5e57200bd6)
    
    Also unbreak SwXTextRangePrinter, not sure why that broke.
    
    Change-Id: I4d6f640e0b8422fcf9ae84fffabc77161311eac1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140522
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <[email protected]>

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index 3ca9a7f64413..206eda25fa18 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -111,7 +111,7 @@ class MarkBasePrinter(object):
     def children(self):
         m = self.value.cast(self.value.dynamic_type)
         return [ ( v, m[ v ] )
-            for v in ( 'm_aName', 'm_pPos1', 'm_pPos2' ) ].__iter__()
+            for v in ( 'm_aName', 'm_oPos1', 'm_oPos2' ) ].__iter__()
 
 class SwXTextRangeImplPrinter(object):
     '''Prints SwXTextRange::Impl.'''
@@ -165,7 +165,7 @@ class SwXTextRangePrinter(object):
         self.value = value
 
     def to_string(self):
-        return "%s %s" % (self.typename, self.value['m_pImpl'])
+        return "%s %s" % (self.typename, 
self.value['m_pImpl']['_M_t']['_M_t'].cast(gdb.lookup_type("std::_Head_base<0, 
SwXTextRange::Impl*, false>"))['_M_head_impl'].dereference())
 
 class BigPtrArrayPrinter(object):
     '''Prints BigPtrArray.'''

Reply via email to