diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-15 21:49:32 +0200 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-16 08:03:08 +0200 |
commit | 2f8095a1b412f8f57d02a9b1c2e2dcd382585143 (patch) | |
tree | fae364ed4d9ac8cd4265fb70b472dca341faf650 | |
parent | 8b08529d6506bfcba9b5658429a1cf4f59c5fbcd (diff) |
use WhichRangesContainer in sc
Change-Id: Ie14250245aa2a8618b3ad6b7a355942621b40833
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118998
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r-- | sc/source/ui/dbgui/validate.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/validate.hxx | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 0946c1163f11..a3fca1d8822f 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -75,12 +75,10 @@ namespace ValidListType = css::sheet::TableValidationVisibility; -const sal_uInt16 ScTPValidationValue::pValueRanges[] = -{ +const WhichRangesContainer ScTPValidationValue::pValueRanges(svl::Items< FID_VALID_LISTTYPE, FID_VALID_LISTTYPE, - FID_VALID_MODE, FID_VALID_ERRTEXT, - 0 -}; + FID_VALID_MODE, FID_VALID_ERRTEXT +>::value); ScValidationDlg::ScValidationDlg(weld::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh) diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 495a6ea5ad72..6117e87b7984 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -75,13 +75,13 @@ class ScValidationDlg; /** The tab page "Criteria" from the Validation dialog. */ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage { - static const sal_uInt16 pValueRanges[]; + static const WhichRangesContainer pValueRanges; public: explicit ScTPValidationValue(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet); static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet ); virtual ~ScTPValidationValue() override; - static const sal_uInt16* GetRanges() { return pValueRanges; } + static const WhichRangesContainer& GetRanges() { return pValueRanges; } virtual bool FillItemSet( SfxItemSet* rArgSet ) override; virtual void Reset( const SfxItemSet* rArgSet ) override; |