diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-08-22 18:08:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-08-22 18:08:48 +0200 |
| commit | ca089c7e204a6dec7fc3ee2c83fc0aefbafaecfa (patch) | |
| tree | 38302fec1a33da723a0972a2f539f713af7552a1 | |
| parent | Fix test assertion message (diff) | |
| download | core-ca089c7e204a6dec7fc3ee2c83fc0aefbafaecfa.tar.gz core-ca089c7e204a6dec7fc3ee2c83fc0aefbafaecfa.zip | |
Use SfxItemSet ctor that checks WID range correctness at compile time
Change-Id: Iea0d6334181d63f5c3eaf87df395efc158ba825e
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 50 |
1 files changed, 20 insertions, 30 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 6b26361b3549..8fdd6c2c82fd 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -213,21 +213,16 @@ SfxItemSet& SdStyleSheet::GetItemSet() // we create the ItemSet 'on demand' if necessary 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_WORDWRAP, - - SDRATTR_EDGE_FIRST, SDRATTR_MEASURE_LAST, - - SDRATTR_3D_FIRST, SDRATTR_3D_LAST, - - EE_PARA_START, EE_CHAR_END, - 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; } @@ -238,21 +233,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_XMLATTRIBUTES, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, - - SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, - - EE_PARA_START, EE_CHAR_END, - - 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_XMLATTRIBUTES, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, + SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, + EE_PARA_START, EE_CHAR_END>{}); bMySet = true; } |