diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-24 11:28:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-25 08:40:00 +0200 |
| commit | 9296ec4403b642939ae49322c5d84066ac5854c8 (patch) | |
| tree | d836c77eaac63f49b9f7d0a7b0d38725cadec55c /cui | |
| parent | 6d61808a3dd98a9d05dacb4e4db68bcdb31dcee9 (diff) | |
convert SvxNumValCategory to scoped enum
and fix bug in NumFormatListBox::GetDefValue in SW
Change-Id: I459b7d5bd181235daa5d128315604f1ed1259ed4
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/numfmt.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index d37ed270e8bd..e5768dcfdf39 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1722,28 +1722,28 @@ OUString SvxNumberFormatTabPage::GetExpColorString( SvxNumValCategory i; switch (nTmpCatPos) { - case CAT_ALL: i=SVX_NUMVAL_STANDARD; break; + case CAT_ALL: i=SvxNumValCategory::Standard; break; - case CAT_NUMBER: i=SVX_NUMVAL_STANDARD; break; + case CAT_NUMBER: i=SvxNumValCategory::Standard; break; - case CAT_PERCENT: i=SVX_NUMVAL_PERCENT; break; + case CAT_PERCENT: i=SvxNumValCategory::Percent; break; - case CAT_CURRENCY: i=SVX_NUMVAL_CURRENCY; break; + case CAT_CURRENCY: i=SvxNumValCategory::Currency; break; - case CAT_DATE: i=SVX_NUMVAL_DATE; break; + case CAT_DATE: i=SvxNumValCategory::Date; break; - case CAT_TIME: i=SVX_NUMVAL_TIME; break; + case CAT_TIME: i=SvxNumValCategory::Time; break; - case CAT_SCIENTIFIC: i=SVX_NUMVAL_SCIENTIFIC; break; + case CAT_SCIENTIFIC: i=SvxNumValCategory::Scientific; break; - case CAT_FRACTION: i=SVX_NUMVAL_FRACTION; break; + case CAT_FRACTION: i=SvxNumValCategory::Fraction; break; - case CAT_BOOLEAN: i=SVX_NUMVAL_BOOLEAN; break; + case CAT_BOOLEAN: i=SvxNumValCategory::Boolean; break; - case CAT_USERDEFINED: i=SVX_NUMVAL_STANDARD; break; + case CAT_USERDEFINED: i=SvxNumValCategory::Standard; break; case CAT_TEXT: - default: i=SVX_NUMVAL_NOVALUE;break; + default: i=SvxNumValCategory::NoValue;break; } double fVal = fSvxNumValConst[i]; |