diff options
Diffstat (limited to 'svx/source/svdraw/svdedxv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 50ac7499ee85..c83ae8b1746c 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2628,21 +2628,18 @@ bool SdrObjEditView::SupportsFormatPaintbrush(SdrInventor nObjectInventor, static const sal_uInt16* GetFormatRangeImpl(bool bTextOnly) { - static constexpr auto gFull - = svl::ItemsArray({ { XATTR_LINE_FIRST, XATTR_LINE_LAST }, - { XATTR_FILL_FIRST, XATTRSET_FILL }, - { SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST }, - { SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST }, // table cell formats - { SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST }, - { SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST }, - { EE_PARA_START, EE_PARA_END }, - { EE_CHAR_START, EE_CHAR_END } }); - - static constexpr auto gTextOnly = svl::ItemsArray({ { SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST }, - { EE_PARA_START, EE_PARA_END }, - { EE_CHAR_START, EE_CHAR_END } }); - - return bTextOnly ? gTextOnly.data() : gFull.data(); + static const sal_uInt16 gFull[] + = { XATTR_LINE_FIRST, XATTR_LINE_LAST, XATTR_FILL_FIRST, + XATTRSET_FILL, SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, + SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, // table cell formats + SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, SDRATTR_TABLE_FIRST, + SDRATTR_TABLE_LAST, EE_PARA_START, EE_PARA_END, + EE_CHAR_START, EE_CHAR_END }; + + static const sal_uInt16 gTextOnly[] = { SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, EE_PARA_START, + EE_PARA_END, EE_CHAR_START, EE_CHAR_END }; + + return bTextOnly ? gTextOnly : gFull; } void SdrObjEditView::TakeFormatPaintBrush(std::shared_ptr<SfxItemSet>& rFormatSet) |