summaryrefslogtreecommitdiff
path: root/solenv/gdb
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-25 16:10:34 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-25 16:12:29 +0200
commit8ae4e64287643b7340e6e35bd16fffeac663e809 (patch)
treebaacd0b2bd06bb6698b8684c342262448e404220 /solenv/gdb
parent87239dbf7d57d812cdecbf75f6e86afaa4864abb (diff)
fix gdb pretty printing
revert part of commit 6f50961e69406a17d6ec998956a6b33208b1001b remove more rtl::OUString and OString prefixes Change-Id: I026f8175c855a20bab54940f6235bca5c91ddbab
Diffstat (limited to 'solenv/gdb')
-rw-r--r--solenv/gdb/libreoffice/sal.py8
-rw-r--r--solenv/gdb/libreoffice/util/uno.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gdb/libreoffice/sal.py b/solenv/gdb/libreoffice/sal.py
index 00923a7bfdb0..8dcfaebe66e1 100644
--- a/solenv/gdb/libreoffice/sal.py
+++ b/solenv/gdb/libreoffice/sal.py
@@ -147,10 +147,10 @@ def build_pretty_printers():
printer.add('_rtl_String', RtlStringPrinter)
printer.add('_rtl_uString', lambda name, val: RtlStringPrinter(name,
val, 'utf-16le'))
- printer.add('OString', StringPrinter)
- printer.add('OUString', lambda name, val: StringPrinter(name, val, 'utf-16'))
- printer.add('OStringBuffer', StringPrinter)
- printer.add('OUStringBuffer', lambda name, val: StringPrinter(name, val, 'utf-16'))
+ printer.add('rtl::OString', StringPrinter)
+ printer.add('rtl::OUString', lambda name, val: StringPrinter(name, val, 'utf-16'))
+ printer.add('rtl::OStringBuffer', StringPrinter)
+ printer.add('rtl::OUStringBuffer', lambda name, val: StringPrinter(name, val, 'utf-16'))
printer.add('sal_Unicode', SalUnicodePrinter, SalUnicodePrinter.query)
# other stuff
diff --git a/solenv/gdb/libreoffice/util/uno.py b/solenv/gdb/libreoffice/util/uno.py
index 3790f075f925..648ea408a6d5 100644
--- a/solenv/gdb/libreoffice/util/uno.py
+++ b/solenv/gdb/libreoffice/util/uno.py
@@ -223,7 +223,7 @@ def make_uno_type(val):
elif type_class == TypeClass.DOUBLE:
uno_type = PrimitiveType(type_class, name, 'double')
elif type_class == TypeClass.STRING:
- uno_type = PrimitiveType(type_class, name, 'OUString')
+ uno_type = PrimitiveType(type_class, name, 'rtl::OUString')
elif type_class == TypeClass.TYPE:
uno_type = PrimitiveType(type_class, name, 'com::sun::star::uno::Type')
elif type_class == TypeClass.ANY: