tdf#100413 Use same default values for preview string and format list

Add specific default values for:
- scientific: to distinguish engineering notation
- fraction: to have quarter format understandable

Change-Id: I73b74713a4bc502e9967b8d2c9983cfc6244912e
Reviewed-on: https://gerrit.libreoffice.org/26391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

1 files changed, 18 insertions, 13 deletions

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 21d8afec3794..415c4a45b078 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1683,31 +1683,36 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, LostFocusHdl_Impl, Control&, rControl,
 OUString SvxNumberFormatTabPage::GetExpColorString(
         Color*& rpPreviewColor, const OUString& rFormatStr, short nTmpCatPos)
 {
-    double nVal = 0;
+    SvxNumValCategory i;
     switch (nTmpCatPos)
     {
-        case CAT_CURRENCY:      nVal=SVX_NUMVAL_CURRENCY; break;
+        case CAT_ALL:           i=SVX_NUMVAL_STANDARD; break;
 
-        case CAT_SCIENTIFIC:
-        case CAT_FRACTION:
-        case CAT_NUMBER:        nVal=SVX_NUMVAL_STANDARD; break;
+        case CAT_NUMBER:        i=SVX_NUMVAL_STANDARD; break;
 
-        case CAT_PERCENT:       nVal=SVX_NUMVAL_PERCENT; break;
+        case CAT_PERCENT:       i=SVX_NUMVAL_PERCENT; break;
 
-        case CAT_ALL:           nVal=SVX_NUMVAL_STANDARD; break;
+        case CAT_CURRENCY:      i=SVX_NUMVAL_CURRENCY; break;
 
-        case CAT_TIME:          nVal=SVX_NUMVAL_TIME; break;
-        case CAT_DATE:          nVal=SVX_NUMVAL_DATE; break;
+        case CAT_DATE:          i=SVX_NUMVAL_DATE; break;
 
-        case CAT_BOOLEAN:       nVal=SVX_NUMVAL_BOOLEAN; break;
+        case CAT_TIME:          i=SVX_NUMVAL_TIME; break;
+
+        case CAT_SCIENTIFIC:    i=SVX_NUMVAL_SCIENTIFIC; break;
+
+        case CAT_FRACTION:      i=SVX_NUMVAL_FRACTION; break;
+
+        case CAT_BOOLEAN:       i=SVX_NUMVAL_BOOLEAN; break;
+
+        case CAT_USERDEFINED:   i=SVX_NUMVAL_STANDARD; break;
 
-        case CAT_USERDEFINED:
         case CAT_TEXT:
-        default:                nVal=0;break;
+        default:                i=SVX_NUMVAL_NOVALUE;break;
     }
+    double fVal = fSvxNumValConst[i];
 
     OUString aPreviewString;
-    pNumFmtShell->MakePrevStringFromVal( rFormatStr, aPreviewString, rpPreviewColor, nVal );
+    pNumFmtShell->MakePrevStringFromVal( rFormatStr, aPreviewString, rpPreviewColor, fVal );
     return aPreviewString;
 }