solenv/vs/LibreOffice.natvis |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 9a3adb8c3a8782c4dfacb5ed383c33ef1a1deeec
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Dec 7 13:32:37 2022 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Dec 7 12:42:42 2022 +0000

    Natvis: improve O(U)String visualizers
    
    ... and unify them.
    Makes sure to show non-printing/special characters in the strings
    (like \n, which didn't show properly); expands buffer to show all
    its elements, not only the first one.
    
    Change-Id: Iab12bbb51f9e39b066866649b297f51837c7c0f4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143767
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
index ec89af18ff68..b2732cef3736 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -10,21 +10,31 @@
 <AutoVisualizer 
xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010";>
   <Type Name="rtl::OUString">
     <DisplayString>{*pData}</DisplayString>
-    <StringView>*pData,su</StringView>
+    <StringView>*pData</StringView>
   </Type>
   <Type Name="rtl::OString">
     <DisplayString>{*pData}</DisplayString>
-    <StringView>*pData,s</StringView>
+    <StringView>*pData</StringView>
   </Type>
   <Type Name="_rtl_uString">
     <DisplayString Condition="length == 0">empty</DisplayString>
-    <DisplayString>u"{buffer,[length]sub}"</DisplayString>
-    <StringView>buffer,[length]sub</StringView>
+    <DisplayString>{buffer,[length]na}</DisplayString>
+    <StringView>buffer,[length]na</StringView>
+    <Expand HideRawView="true">
+      <Item Name="refCount">refCount</Item>
+      <Item Name="length">length</Item>
+      <Item Name="buffer">buffer,[length+1]</Item>
+       </Expand>
   </Type>
   <Type Name="_rtl_String">
     <DisplayString Condition="length == 0">empty</DisplayString>
-    <DisplayString>{buffer,[length]s}</DisplayString>
-    <StringView>buffer,[length]s</StringView>
+    <DisplayString>{buffer,[length]na}</DisplayString>
+    <StringView>buffer,[length]na</StringView>
+    <Expand HideRawView="true">
+      <Item Name="refCount">refCount</Item>
+      <Item Name="length">length</Item>
+      <Item Name="buffer">buffer,[length+1]</Item>
+       </Expand>
   </Type>
   <Type Name="rtl::OUStringLiteral &lt; * &gt;">
     <DisplayString>{str}</DisplayString>

Reply via email to