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

[Mike Kaganski]

 solenv/vs/LibreOffice.natvis |   49 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

New commits:
commit aae64e0f9cd1582c0dc31992aa22b849d2527c80
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Fri Jun 22 16:46:20 2018 +0200

    Natvis: visualizers for Sw*Frame
    
    Change-Id: Ia8ffdaf9a5addcf82828b4894f669ee82a825fd0
    Reviewed-on: https://gerrit.libreoffice.org/56303
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
index ad45cbe19432..0a53a1161fad 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -88,7 +88,7 @@
     <DisplayString>X:{nA}, Y:{nB}</DisplayString>
   </Type>
   <Type Name="Size">
-    <DisplayString>Width:{nA}, Height:{nB}</DisplayString>
+    <DisplayString>W:{nA}, H:{nB}</DisplayString>
   </Type>
   <Type Name="Range">
     <DisplayString>Min:{nA}, Max:{nB}</DisplayString>
@@ -403,4 +403,51 @@
       <Item Name='Type'>maType</Item>
     </Expand>
   </Type>
+  <Type Name='SwFrame'>
+    <DisplayString IncludeView='min'>{mnFrameType,en} of {mpUpper->mnFrameType,en} {(void*)mpUpper}</DisplayString>
+    <DisplayString Condition='!mpUpper'>{{{mnFrameType,en}}}</DisplayString>
+    <DisplayString>{{{*this,view(min)}}}</DisplayString>
+    <Expand>
+      <Synthetic Name='Frame'>
+        <DisplayString>Area: {maFrameArea}; Print Area: {maFramePrintArea}</DisplayString>
+        <Expand>
+          <Item Name='Area'>maFrameArea</Item>
+          <Item Name='Print Area'>maFramePrintArea</Item>
+        </Expand>
+      </Synthetic>
+      <Item Name='Upper'>mpUpper</Item>
+    </Expand>
+  </Type>
+  <Type Name='SwLayoutFrame'>
+    <DisplayString>{(SwFrame&)*this}</DisplayString>
+    <Expand>
+      <ExpandedItem>(SwFrame&)(*this)</ExpandedItem>
+      <Synthetic Name='Lowers' Condition='m_pLower'>
+        <Expand>
+          <CustomListItems>
+            <Variable Name="pChild" InitialValue="m_pLower"/>
+            <Loop>
+              <Break Condition="!pChild"/>
+              <Item>pChild</Item>
+              <Exec>pChild = pChild->mpNext</Exec>
+            </Loop>
+          </CustomListItems>
+        </Expand>
+      </Synthetic>
+    </Expand>
+  </Type>
+  <Type Name="SwRowFrame">
+    <DisplayString Condition="m_bIsRepeatedHeadline">{{Headline {(SwFrame&)*this,view(min)}}}</DisplayString>
+    <DisplayString>{(SwFrame&)*this}</DisplayString>
+    <Expand>
+      <ExpandedItem>(SwLayoutFrame&)(*this)</ExpandedItem>
+    </Expand>
+  </Type>
+  <Type Name="SwTabFrame">
+    <DisplayString Condition="m_pPrecede">{{Follow {(SwFrame&)*this,view(min)}}}</DisplayString>
+    <DisplayString>{(SwFrame&)*this}</DisplayString>
+    <Expand>
+      <ExpandedItem>(SwLayoutFrame&)(*this)</ExpandedItem>
+    </Expand>
+  </Type>
 </AutoVisualizer>