From 1e3a00f0c772a76a1dd76b8272e2c35a1802d574 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 19 Jun 2017 09:32:45 +0200
Subject: 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
---
 editeng/source/uno/unofdesc.cxx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 7e136e4ae8c4..c7f9b0760c4b 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -190,13 +190,12 @@ void SvxUnoFontDescriptor::setPropertyToDefault( SfxItemSet& rSet )
 
 uno::Any SvxUnoFontDescriptor::getPropertyDefault( SfxItemPool* pPool )
 {
-    SfxItemSet aSet( *pPool, svl::Items<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO,
-                             EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT,
-                             EE_CHAR_ITALIC, EE_CHAR_ITALIC,
-                             EE_CHAR_UNDERLINE, EE_CHAR_UNDERLINE,
-                             EE_CHAR_WEIGHT, EE_CHAR_WEIGHT,
-                             EE_CHAR_STRIKEOUT, EE_CHAR_STRIKEOUT,
-                             EE_CHAR_WLM, EE_CHAR_WLM>{} );
+    SfxItemSet aSet(
+        *pPool,
+        svl::Items<
+            EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT,
+            EE_CHAR_WEIGHT, EE_CHAR_ITALIC,
+            EE_CHAR_WLM, EE_CHAR_WLM>{});
 
     uno::Any aAny;
 
-- 
cgit