diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-07 09:41:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-07 10:48:19 +0200 |
| commit | 99330e7b35b71bdc2a765a24ad8a25f6067aa3a6 (patch) | |
| tree | 12044a6028eafadae8e412eadc857f54f03397ac /scaddins | |
| parent | 4dc6dee3aa76085a308df5a71872cb40ef5d3aaa (diff) | |
convert ScaCategory to scoped enum
and drop unused AddIn constant
Change-Id: Ic775e3c956c7200bb04be0a776a688284ba9d19b
Diffstat (limited to 'scaddins')
| -rw-r--r-- | scaddins/source/pricing/pricing.cxx | 23 | ||||
| -rw-r--r-- | scaddins/source/pricing/pricing.hxx | 19 |
2 files changed, 19 insertions, 23 deletions
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index b5e696057201..022a89c6eb23 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -60,10 +60,10 @@ ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) : const ScaFuncDataBase pFuncDataArr[] = { - FUNCDATA( OptBarrier, 13, ScaCat_Finance, UNIQUE, STDPAR), - FUNCDATA( OptTouch, 11, ScaCat_Finance, UNIQUE, STDPAR), - FUNCDATA( OptProbHit, 6, ScaCat_Finance, UNIQUE, STDPAR), - FUNCDATA( OptProbInMoney, 8, ScaCat_Finance, UNIQUE, STDPAR) + FUNCDATA( OptBarrier, 13, ScaCategory::Finance, UNIQUE, STDPAR), + FUNCDATA( OptTouch, 11, ScaCategory::Finance, UNIQUE, STDPAR), + FUNCDATA( OptProbHit, 6, ScaCategory::Finance, UNIQUE, STDPAR), + FUNCDATA( OptProbInMoney, 8, ScaCategory::Finance, UNIQUE, STDPAR) }; #undef FUNCDATA @@ -371,15 +371,12 @@ OUString SAL_CALL ScaPricingAddIn::getProgrammaticCategoryName( { switch( fDataIt->GetCategory() ) { - case ScaCat_DateTime: aRet = STR_FROM_ANSI( "Date&Time" ); break; - case ScaCat_Text: aRet = STR_FROM_ANSI( "Text" ); break; - case ScaCat_Finance: aRet = STR_FROM_ANSI( "Financial" ); break; - case ScaCat_Inf: aRet = STR_FROM_ANSI( "Information" ); break; - case ScaCat_Math: aRet = STR_FROM_ANSI( "Mathematical" ); break; - case ScaCat_Tech: aRet = STR_FROM_ANSI( "Technical" ); break; - // coverity[dead_error_begin] - following conditions exist to avoid compiler warning - default: - break; + case ScaCategory::DateTime: aRet = STR_FROM_ANSI( "Date&Time" ); break; + case ScaCategory::Text: aRet = STR_FROM_ANSI( "Text" ); break; + case ScaCategory::Finance: aRet = STR_FROM_ANSI( "Financial" ); break; + case ScaCategory::Inf: aRet = STR_FROM_ANSI( "Information" ); break; + case ScaCategory::Math: aRet = STR_FROM_ANSI( "Mathematical" ); break; + case ScaCategory::Tech: aRet = STR_FROM_ANSI( "Technical" ); break; } } diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index d3cb74f9f88c..3fa96cde37bb 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -111,15 +111,14 @@ public: }; -enum ScaCategory +enum class ScaCategory { - ScaCat_AddIn, - ScaCat_DateTime, - ScaCat_Text, - ScaCat_Finance, - ScaCat_Inf, - ScaCat_Math, - ScaCat_Tech + DateTime, + Text, + Finance, + Inf, + Math, + Tech }; struct ScaFuncDataBase @@ -130,8 +129,8 @@ struct ScaFuncDataBase sal_uInt16 nCompListID; // resource ID to list of valid names sal_uInt16 nParamCount; // number of named / described parameters ScaCategory eCat; // function category - bool bDouble; // name already exist in Calc - bool bWithOpt; // first parameter is internal + bool bDouble; // name already exist in Calc + bool bWithOpt; // first parameter is internal }; class ScaFuncData final |