[Libreoffice-commits] core.git: sd/source

[Stephan Bergmann]

 sd/source/core/stlsheet.cxx |   29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 9277cbcd691b484c3d746e2e9df9cc58544a1de2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Aug 23 09:52:52 2017 +0200

    Fix WID ranges
    
    Change-Id: I50e7f6b16d835ec86e8a98e6d94ee812391a37d4

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 8fdd6c2c82fd..27d80a3f6fac 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -264,25 +264,16 @@ SfxItemSet& SdStyleSheet::GetItemSet()
         {
             if (!pSet)
             {
-                sal_uInt16 const nWhichPairTable[] {
-                                             XATTR_LINE_FIRST,              XATTR_LINE_LAST,
-                                             XATTR_FILL_FIRST,              XATTR_FILL_LAST,
-
-                                             SDRATTR_SHADOW_FIRST,          SDRATTR_SHADOW_LAST,
-                                             SDRATTR_TEXT_MINFRAMEHEIGHT,   SDRATTR_TEXT_CONTOURFRAME,
-
-                                             SDRATTR_TEXT_WORDWRAP,         SDRATTR_TEXT_WORDWRAP,
-
-                                             SDRATTR_EDGE_FIRST,            SDRATTR_EDGE_LAST,
-                                             SDRATTR_MEASURE_FIRST,         SDRATTR_MEASURE_LAST,
-
-                                             EE_PARA_START,                 EE_CHAR_END,
-
-                                             SDRATTR_XMLATTRIBUTES,          SDRATTR_TEXT_USEFIXEDCELLHEIGHT,
-                                             SDRATTR_3D_FIRST, SDRATTR_3D_LAST,
-                                             0, 0 };
-
-                pSet = new SfxItemSet(GetPool().GetPool(), nWhichPairTable);
+                pSet = new SfxItemSet(
+                    GetPool().GetPool(),
+                    svl::Items<
+                        XATTR_LINE_FIRST, XATTR_LINE_LAST,
+                        XATTR_FILL_FIRST, XATTR_FILL_LAST,
+                        SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,
+                        SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_WORDWRAP,
+                        SDRATTR_EDGE_FIRST, SDRATTR_MEASURE_LAST,
+                        SDRATTR_3D_FIRST, SDRATTR_3D_LAST,
+                        EE_PARA_START, EE_CHAR_END>{});
                 bMySet = true;
             }