Make SfxItemSet ranges correct by construction: Fix static cases

...with the aid of an extended compilerplugins/clang/store/sfxitemsetrewrite.cxx
(which in turn needed a small addition to compilerplugins/clang/check.hxx).

Enable svl::detail::validGap check for the static case, but keep it disabled for
now for the dynamic case.

Change-Id: I4846ba8e99aff94a86518e2cb5044e575093386e

1 files changed, 3 insertions, 3 deletions

diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 39ec0a18222c..62b1ea3cb8c3 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -146,18 +146,18 @@ SfxItemSet::SfxItemSet(
     std::size_t i = 0;
     std::size_t size = 0;
 #if !defined NDEBUG
-    sal_uInt16 prev = 0;
+    //TODO: sal_uInt16 prev = 0;
 #endif
     for (auto const & p: wids) {
         assert(svl::detail::validRange(p.wid1, p.wid2));
-        assert(prev == 0 || svl::detail::validGap(prev, p.wid1));
+        //TODO: assert(prev == 0 || svl::detail::validGap(prev, p.wid1));
         m_pWhichRanges[i++] = p.wid1;
         m_pWhichRanges[i++] = p.wid2;
         size += svl::detail::rangeSize(p.wid1, p.wid2);
             // cannot overflow, assuming std::size_t is no smaller than
             // sal_uInt16
 #if !defined NDEBUG
-        prev = p.wid2;
+        //TODO: prev = p.wid2;
 #endif
     }
     m_pWhichRanges[i] = 0;