diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-16 01:03:06 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-16 03:46:26 +0200 |
| commit | 01c0cf63be7155531e1240d79e3936f8c4600864 (patch) | |
| tree | 774a3476e298a2aac68cea7359f87efc33e635da /cui/source/tabpages/tpshadow.cxx | |
| parent | da13b76e07231131cb951868a314ee6f51c0f254 (diff) | |
Move validity check to svl::Items, to avoid invalid WhichRangesContainer
This uncovered lots of pre-existing invalid ranges, e.g. introduced
in commit 6dbfbebad37fd84208e4c336f0864d26019db153, or in much older
commit 46952138c938730afcc3607e1a524bb590b0e30e.
Also this makes the static in svl::Items to be array of WhichPair,
to avoid questionable reinterpret_cast in WhichRangesContainer ctor.
Change-Id: I86030b2a2ac0a6d98870f8f7f5cc83e071c6597c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119003
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cui/source/tabpages/tpshadow.cxx')
| -rw-r--r-- | cui/source/tabpages/tpshadow.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 8e0c86eaea59..3169b723e37d 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -43,9 +43,10 @@ using namespace com::sun::star; const WhichRangesContainer SvxShadowTabPage::pShadowRanges(svl::Items< SDRATTR_SHADOWCOLOR, SDRATTR_SHADOWTRANSPARENCE, - SDRATTR_SHADOWBLUR, SID_ATTR_FILL_SHADOW, - SID_ATTR_FILL_SHADOW, SID_ATTR_SHADOW_TRANSPARENCE, - SID_ATTR_SHADOW_BLUR, SID_ATTR_SHADOW_YDISTANCE + SDRATTR_SHADOWBLUR, SDRATTR_SHADOWBLUR, + SID_ATTR_FILL_SHADOW, SID_ATTR_FILL_SHADOW, + SID_ATTR_SHADOW_BLUR, SID_ATTR_SHADOW_BLUR, + SID_ATTR_SHADOW_TRANSPARENCE, SID_ATTR_SHADOW_YDISTANCE >::value); SvxShadowTabPage::SvxShadowTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) |