convert SvxNumberValueType to scoped enum

Change-Id: Ic82c18c16de8bd756a444de47c9a68e88fa1c7ee

2 files changed, 14 insertions, 14 deletions

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index f27f8c587143..dd539826e546 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -103,16 +103,16 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter*  pNumFormatter,
 
     switch ( eValType )
     {
-        case SVX_VALUE_TYPE_STRING:
+        case SvxNumberValueType::String:
             aValStr = rNumStr;
             break;
-        case SVX_VALUE_TYPE_NUMBER:
+        case SvxNumberValueType::Number:
             if ( pFormatter )
             {
                 nValNum = GetDefaultValNum( pFormatter->GetType( nCurFormatKey ) );
             }
             SAL_FALLTHROUGH;
-        case SVX_VALUE_TYPE_UNDEFINED:
+        case SvxNumberValueType::Undefined:
         default:
             aValStr.clear();
     }
@@ -144,11 +144,11 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter*  pNumFormatter,
 
     switch ( eValType )
     {
-        case SVX_VALUE_TYPE_NUMBER:
+        case SvxNumberValueType::Number:
             nValNum = nNumVal;
             break;
-        case SVX_VALUE_TYPE_STRING:
-        case SVX_VALUE_TYPE_UNDEFINED:
+        case SvxNumberValueType::String:
+        case SvxNumberValueType::Undefined:
         default:
             nValNum = SVX_NUMVAL_STANDARD;
             bIsDefaultValNum = true;
@@ -454,7 +454,7 @@ void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr,
         //  format exists
 
         //  #50441# if a string was set in addition to the value, use it for text formats
-        bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
+        bool bUseText = ( eValType == SvxNumberValueType::String ||
                             ( !aValStr.isEmpty() && ( pFormatter->GetType(nExistingFormat) & css::util::NumberFormat::TEXT ) ) );
         if ( bUseText )
         {
@@ -539,7 +539,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos,
     short                   nSelPos     = SELPOS_NONE;
 
     // Sonderbehandlung fuer undefiniertes Zahlenformat:
-    if ( (eValType == SVX_VALUE_TYPE_UNDEFINED) && (nCurFormatKey == 0) )
+    if ( (eValType == SvxNumberValueType::Undefined) && (nCurFormatKey == 0) )
         PosToCategory_Impl( CAT_ALL, nCurCategory );        // Kategorie = Alle
     else
         nCurCategory = css::util::NumberFormat::UNDEFINED;      // Kategorie = Undefiniert
@@ -1116,7 +1116,7 @@ void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpC
     rpColor = nullptr;
 
     //  #50441# if a string was set in addition to the value, use it for text formats
-    bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
+    bool bUseText = ( eValType == SvxNumberValueType::String ||
                         ( !aValStr.isEmpty() && ( pFormatter->GetType(nCurFormatKey) & css::util::NumberFormat::TEXT ) ) );
 
     if ( bUseText )
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 18f7e65d1583..680493be871d 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -32,7 +32,7 @@
 
 SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) :
 
-    INIT( nullptr, SVX_VALUE_TYPE_UNDEFINED, 0, "" )
+    INIT( nullptr, SvxNumberValueType::Undefined, 0, "" )
 
 {
 }
@@ -41,7 +41,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) :
 SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
                                       const sal_uInt16 nId ) :
 
-    INIT( pNumFormatter, SVX_VALUE_TYPE_UNDEFINED, 0, "" )
+    INIT( pNumFormatter, SvxNumberValueType::Undefined, 0, "" )
 
 {
 }
@@ -50,7 +50,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
 SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
                                       const OUString& rVal, const sal_uInt16 nId ) :
 
-    INIT( pNumFormatter, SVX_VALUE_TYPE_STRING, 0, rVal )
+    INIT( pNumFormatter, SvxNumberValueType::String, 0, rVal )
 
 {
 }
@@ -59,7 +59,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
 SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
                                       const double& rVal, const sal_uInt16 nId ) :
 
-    INIT( pNumFormatter, SVX_VALUE_TYPE_NUMBER, rVal, "" )
+    INIT( pNumFormatter, SvxNumberValueType::Number, rVal, "" )
 
 {
 }
@@ -69,7 +69,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
                                       const double& rVal, const OUString& rValueStr,
                                       const sal_uInt16 nId ) :
 
-    INIT( pNumFormatter, SVX_VALUE_TYPE_NUMBER, rVal, rValueStr )
+    INIT( pNumFormatter, SvxNumberValueType::Number, rVal, rValueStr )
 
 {
 }