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

[Mike Kaganski (via logerrit)]

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

New commits:
commit adeaa3a2cf31478c15147afe1303b77f8949293a
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jul 29 18:37:37 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Jul 29 20:16:10 2021 +0200

    Update VS natvis for recent WhichRangesContainer changes
    
    Change-Id: I2171e88ca4d3404d35fe669c3c7af6ccd817b254
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119617
    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 ec61546fe153..ee4171bac9cf 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -327,37 +327,34 @@
   <Type Name="SfxPoolItem">
     <DisplayString>{{which={m_nWhich,x}}}</DisplayString>
   </Type>
+  <Type Name="WhichRangesContainer">
+    <DisplayString>{{size={m_size,d}}}</DisplayString>
+    <Expand>
+      <ArrayItems>
+        <Size>m_size</Size>
+        <ValuePointer>m_pairs</ValuePointer>
+      </ArrayItems>
+    </Expand>
+  </Type>
   <Type Name="SfxItemSet">
     <DisplayString>{{size={m_nCount,d}}}</DisplayString>
     <Expand>
       <CustomListItems>
         <Variable Name='pCurItem' InitialValue='m_pItems._Mypair._Myval2'/>
-        <Variable Name='pCurRange' InitialValue='m_pWhichRanges'/>
+        <Variable Name='nRanges' InitialValue='m_pWhichRanges.m_size'/>
+        <Variable Name='nCurRange' InitialValue='0'/>
         <Variable Name='nCurWhich' InitialValue='0'/>
-        <Loop Condition='*pCurRange'>
-          <Exec>nCurWhich = *pCurRange</Exec>
-          <Loop Condition='nCurWhich<=*(pCurRange+1)'>
+        <Loop Condition='nCurRange < nRanges'>
+          <Exec>nCurWhich = m_pWhichRanges.m_pairs[nCurRange].first</Exec>
+          <Loop Condition='nCurWhich <= m_pWhichRanges.m_pairs[nCurRange].second'>
             <Item Condition='*pCurItem'>**pCurItem</Item>
             <Exec>++pCurItem</Exec>
             <Exec>++nCurWhich</Exec>
           </Loop>
-          <Exec>pCurRange+=2</Exec>
+          <Exec>++nCurRange</Exec>
         </Loop>
       </CustomListItems>
-      <Synthetic Name="Which Ranges">
-        <Expand>
-          <CustomListItems>
-            <Variable Name='pCurRange' InitialValue='m_pWhichRanges'/>
-            <Variable Name='i' InitialValue='0'/>
-            <Loop Condition='*pCurRange'>
-              <Item Name='[{i,d}] begin'>*pCurRange</Item>
-              <Item Name='[{i,d}] end'>*(pCurRange+1)</Item>
-              <Exec>pCurRange+=2</Exec>
-              <Exec>++i</Exec>
-            </Loop>
-          </CustomListItems>
-        </Expand>
-      </Synthetic>
+      <Item Name="Which Ranges">m_pWhichRanges</Item>
       <Item Condition="m_pParent != nullptr" Name="Parent">*m_pParent</Item>
     </Expand>
   </Type>