mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SfxItemSet ctor that checks WID range correctness at compile time

Browse Source 
Change-Id: Iea0d6334181d63f5c3eaf87df395efc158ba825e
This commit is contained in:
Stephan Bergmann
2017-08-22 18:08:48 +02:00
parent 4e85d4ba5f
commit ca089c7e20
1 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
sd/source/core/stlsheet.cxx
View File

@@ -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;
}