Convert FieldUnit to scoped enum

Change-Id: Id2df31daa596a18c79af5fc6ea162deb6e24d5af
Reviewed-on: https://gerrit.libreoffice.org/62958
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

5 files changed, 107 insertions, 106 deletions

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index ca805b44cab5..8061558284a5 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -426,7 +426,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
     aSize.setHeight( aTxtSize.Height() );
 
     // SourceUnit to Twips
-    if ( eSourceUnit == FUNIT_POINT )
+    if ( eSourceUnit == FieldUnit::POINT )
     {
         nLine1      /= 5;
         nLine2      /= 5;
@@ -485,7 +485,7 @@ LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) :
 {
     aTxtSize.setWidth( GetTextWidth( " " ) );
     aTxtSize.setHeight( GetTextHeight() );
-    eSourceUnit = FUNIT_POINT;
+    eSourceUnit = FieldUnit::POINT;
 
     aVirDev->SetLineColor();
     aVirDev->SetMapMode( MapMode( MapUnit::MapTwip ) );
@@ -1352,7 +1352,7 @@ void FontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList )
     pTempAry = pAry;
     while ( *pTempAry )
     {
-        InsertValue( *pTempAry, FUNIT_NONE, nPos );
+        InsertValue( *pTempAry, FieldUnit::NONE, nPos );
         ComboBox::SetEntryData( nPos, reinterpret_cast<void*>(*pTempAry) );
         nPos++;
         pTempAry++;
@@ -1383,7 +1383,7 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
 
 void FontSizeBox::SetValue( sal_Int64 nNewValue )
 {
-    SetValue( nNewValue, FUNIT_NONE );
+    SetValue( nNewValue, FieldUnit::NONE );
 }
 
 sal_Int64 FontSizeBox::GetValueFromStringUnit(const OUString& rStr, FieldUnit eOutUnit) const
@@ -1399,7 +1399,7 @@ sal_Int64 FontSizeBox::GetValueFromStringUnit(const OUString& rStr, FieldUnit eO
 SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p)
     : pFontList(nullptr)
     , nSavedValue(0)
-    , eUnit(FUNIT_POINT)
+    , eUnit(FieldUnit::POINT)
     , nDecimalDigits(1)
     , nRelMin(0)
     , nRelMax(0)
@@ -1577,7 +1577,7 @@ void SvtFontSizeBox::EnableRelativeMode( sal_uInt16 nNewMin, sal_uInt16 nNewMax,
     nRelMin       = nNewMin;
     nRelMax       = nNewMax;
     nRelStep      = nStep;
-    SetUnit(FUNIT_POINT);
+    SetUnit(FieldUnit::POINT);
 }
 
 void SvtFontSizeBox::EnablePtRelativeMode( short nNewMin, short nNewMax, short nStep )
@@ -1586,7 +1586,7 @@ void SvtFontSizeBox::EnablePtRelativeMode( short nNewMin, short nNewMax, short n
     nPtRelMin     = nNewMin;
     nPtRelMax     = nNewMax;
     nPtRelStep    = nStep;
-    SetUnit(FUNIT_POINT);
+    SetUnit(FieldUnit::POINT);
 }
 
 void SvtFontSizeBox::InsertValue(int i)
@@ -1614,7 +1614,7 @@ void SvtFontSizeBox::SetRelative( bool bNewRelative )
         if (bPtRelative)
         {
             SetDecimalDigits( 1 );
-            SetUnit(FUNIT_POINT);
+            SetUnit(FieldUnit::POINT);
 
             short i = nPtRelMin, n = 0;
             // JP 30.06.98: more than 100 values are not useful
@@ -1627,7 +1627,7 @@ void SvtFontSizeBox::SetRelative( bool bNewRelative )
         else
         {
             SetDecimalDigits(0);
-            SetUnit(FUNIT_PERCENT);
+            SetUnit(FieldUnit::PERCENT);
 
             sal_uInt16 i = nRelMin;
             while ( i <= nRelMax )
@@ -1643,7 +1643,7 @@ void SvtFontSizeBox::SetRelative( bool bNewRelative )
             m_xComboBox->clear();
         bRelative = bPtRelative = false;
         SetDecimalDigits(1);
-        SetUnit(FUNIT_POINT);
+        SetUnit(FieldUnit::POINT);
         if ( pFontList)
             Fill( &aFontMetric, pFontList );
     }
@@ -1657,7 +1657,7 @@ OUString SvtFontSizeBox::format_number(int nValue) const
     OUString sRet;
 
     //pawn percent off to icu to decide whether percent is separated from its number for this locale
-    if (eUnit == FUNIT_PERCENT)
+    if (eUnit == FieldUnit::PERCENT)
     {
         double fValue = nValue;
         fValue /= weld::SpinButton::Power10(nDecimalDigits);
@@ -1668,9 +1668,9 @@ OUString SvtFontSizeBox::format_number(int nValue) const
         const SvtSysLocale aSysLocale;
         const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
         sRet = rLocaleData.getNum(nValue, nDecimalDigits, true, false);
-        if (eUnit != FUNIT_NONE && eUnit != FUNIT_DEGREE)
+        if (eUnit != FieldUnit::NONE && eUnit != FieldUnit::DEGREE)
             sRet += " ";
-        assert(eUnit != FUNIT_PERCENT);
+        assert(eUnit != FieldUnit::PERCENT);
         sRet += weld::MetricSpinButton::MetricToString(eUnit);
     }
 
@@ -1749,7 +1749,7 @@ void SvtLineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
     Size aSize(getPreviewSize(*m_xControl));
 
     // SourceUnit to Twips
-    if ( eSourceUnit == FUNIT_POINT )
+    if ( eSourceUnit == FieldUnit::POINT )
     {
         nLine1      /= 5;
         nLine2      /= 5;
@@ -1848,7 +1848,7 @@ SvtLineListBox::SvtLineListBox(std::unique_ptr<weld::MenuButton> pControl)
     m_xControl->set_size_request(std::max(aNonePrefSize.Width(), aSolidPrefSize.Width()),
                                  std::max(aNonePrefSize.Height(), aSolidPrefSize.Height()));
 
-    eSourceUnit = FUNIT_POINT;
+    eSourceUnit = FieldUnit::POINT;
 
     aVirDev->SetLineColor();
     aVirDev->SetMapMode(MapMode(MapUnit::MapTwip));
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index a27fb608d7b2..20a53e9e4126 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -219,7 +219,7 @@ void Ruler::ImplInit( WinBits nWinBits )
 
     // Initialize Units
     mnUnitIndex     = RULER_UNIT_CM;
-    meUnit          = FUNIT_CM;
+    meUnit          = FieldUnit::CM;
     maZoom          = Fraction( 1, 1 );
 
     // Recalculate border widths
@@ -2387,37 +2387,37 @@ void Ruler::SetUnit( FieldUnit eNewUnit )
     meUnit = eNewUnit;
     switch ( meUnit )
     {
-        case FUNIT_MM:
+        case FieldUnit::MM:
             mnUnitIndex = RULER_UNIT_MM;
             break;
-        case FUNIT_CM:
+        case FieldUnit::CM:
             mnUnitIndex = RULER_UNIT_CM;
             break;
-        case FUNIT_M:
+        case FieldUnit::M:
             mnUnitIndex = RULER_UNIT_M;
             break;
-        case FUNIT_KM:
+        case FieldUnit::KM:
             mnUnitIndex = RULER_UNIT_KM;
             break;
-        case FUNIT_INCH:
+        case FieldUnit::INCH:
             mnUnitIndex = RULER_UNIT_INCH;
             break;
-        case FUNIT_FOOT:
+        case FieldUnit::FOOT:
             mnUnitIndex = RULER_UNIT_FOOT;
             break;
-        case FUNIT_MILE:
+        case FieldUnit::MILE:
             mnUnitIndex = RULER_UNIT_MILE;
             break;
-        case FUNIT_POINT:
+        case FieldUnit::POINT:
             mnUnitIndex = RULER_UNIT_POINT;
             break;
-        case FUNIT_PICA:
+        case FieldUnit::PICA:
             mnUnitIndex = RULER_UNIT_PICA;
             break;
-        case FUNIT_CHAR:
+        case FieldUnit::CHAR:
             mnUnitIndex = RULER_UNIT_CHAR;
             break;
-        case FUNIT_LINE:
+        case FieldUnit::LINE:
             mnUnitIndex = RULER_UNIT_LINE;
             break;
         default:
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index d4ca22c4d2e7..4efde710a714 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -106,7 +106,7 @@ public:
 
 SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< uno::XComponentContext >& rxContext ) :
     mxContext           ( rxContext ),
-    meFieldUnit         ( FUNIT_CM ),
+    meFieldUnit         ( FieldUnit::CM ),
     mbExportSelection   ( false ),
     mbGraphicsSource    ( true )
 {
@@ -286,7 +286,8 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp
             aPropertyName = "Metric";
         else
             aPropertyName = "NonMetric";
-        meFieldUnit = static_cast<FieldUnit>(aConfigItem.ReadInt32( aPropertyName, FUNIT_CM ));
+        meFieldUnit = static_cast<FieldUnit>(
+            aConfigItem.ReadInt32(aPropertyName, sal_Int32(FieldUnit::CM)));
     }
 }
 
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index b9267a6ddaba..99c2ad2b1cd6 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -106,24 +106,24 @@ sal_Int32 ExportDialog::GetDefaultUnit()
     sal_Int32 nDefaultUnit = UNIT_CM;
     switch( mrFltCallPara.eFieldUnit )
     {
-//      case FUNIT_NONE :
-//      case FUNIT_PERCENT :
-//      case FUNIT_CUSTOM :
+//      case FieldUnit::NONE :
+//      case FieldUnit::PERCENT :
+//      case FieldUnit::CUSTOM :
         default:                nDefaultUnit = UNIT_CM; break;
 
-        case FUNIT_MILE :       // PASSTHROUGH INTENDED
-        case FUNIT_FOOT :
-        case FUNIT_TWIP :
-        case FUNIT_PICA :       nDefaultUnit = UNIT_INCH; break;
+        case FieldUnit::MILE :       // PASSTHROUGH INTENDED
+        case FieldUnit::FOOT :
+        case FieldUnit::TWIP :
+        case FieldUnit::PICA :       nDefaultUnit = UNIT_INCH; break;
 
-        case FUNIT_KM :         // PASSTHROUGH INTENDED
-        case FUNIT_M :
-        case FUNIT_100TH_MM :   nDefaultUnit = UNIT_CM; break;
+        case FieldUnit::KM :         // PASSTHROUGH INTENDED
+        case FieldUnit::M :
+        case FieldUnit::MM_100TH :   nDefaultUnit = UNIT_CM; break;
 
-        case FUNIT_INCH :       nDefaultUnit = UNIT_INCH; break;
-        case FUNIT_CM :         nDefaultUnit = UNIT_CM; break;
-        case FUNIT_MM :         nDefaultUnit = UNIT_MM; break;
-        case FUNIT_POINT :      nDefaultUnit = UNIT_POINT; break;
+        case FieldUnit::INCH :       nDefaultUnit = UNIT_INCH; break;
+        case FieldUnit::CM :         nDefaultUnit = UNIT_CM; break;
+        case FieldUnit::MM :         nDefaultUnit = UNIT_MM; break;
+        case FieldUnit::POINT :      nDefaultUnit = UNIT_POINT; break;
     }
     return nDefaultUnit;
 }
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index d08820e041d6..1d3e40cdcebc 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -22,7 +22,7 @@
 void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll)
 {
     int nMin, nMax;
-    rField.get_range(nMin, nMax, FUNIT_TWIP);
+    rField.get_range(nMin, nMax, FieldUnit::TWIP);
     nMin = rField.denormalize(nMin);
     nMax = rField.denormalize(nMax);
 
@@ -30,13 +30,13 @@ void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll)
     {
         switch (eUnit)
         {
-            case FUNIT_M:
-            case FUNIT_KM:
-                eUnit = FUNIT_CM;
+            case FieldUnit::M:
+            case FieldUnit::KM:
+                eUnit = FieldUnit::CM;
                 break;
-            case FUNIT_FOOT:
-            case FUNIT_MILE:
-                eUnit = FUNIT_INCH;
+            case FieldUnit::FOOT:
+            case FieldUnit::MILE:
+                eUnit = FieldUnit::INCH;
                 break;
             default: //prevent warning
                 break;
@@ -45,20 +45,20 @@ void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll)
 
     rField.set_unit(eUnit);
 
-    if (FUNIT_POINT == eUnit && rField.get_digits() > 1)
+    if (FieldUnit::POINT == eUnit && rField.get_digits() > 1)
         rField.set_digits(1);
     else
         rField.set_digits(2);
 
     switch (eUnit)
     {
-        // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FUNIT_MM
-        case FUNIT_CHAR:
-        case FUNIT_LINE:
-        case FUNIT_MM:
+        // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FieldUnit::MM
+        case FieldUnit::CHAR:
+        case FieldUnit::LINE:
+        case FieldUnit::MM:
             rField.set_increments(50, 500, eUnit);
             break;
-        case FUNIT_INCH:
+        case FieldUnit::INCH:
             rField.set_increments(2, 20, eUnit);
             break;
         default:
@@ -70,29 +70,29 @@ void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll)
     {
         nMin = rField.normalize(nMin);
         nMax = rField.normalize(nMax);
-        rField.set_range(nMin, nMax, FUNIT_TWIP);
+        rField.set_range(nMin, nMax, FieldUnit::TWIP);
     }
 }
 
 void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll )
 {
-    sal_Int64 nFirst    = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) );
-    sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) );
-    sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) );
-    sal_Int64 nMax = rField.Denormalize( rField.GetMax( FUNIT_TWIP ) );
+    sal_Int64 nFirst    = rField.Denormalize( rField.GetFirst( FieldUnit::TWIP ) );
+    sal_Int64 nLast = rField.Denormalize( rField.GetLast( FieldUnit::TWIP ) );
+    sal_Int64 nMin = rField.Denormalize( rField.GetMin( FieldUnit::TWIP ) );
+    sal_Int64 nMax = rField.Denormalize( rField.GetMax( FieldUnit::TWIP ) );
 
     if ( !bAll )
     {
         switch ( eUnit )
         {
-            case FUNIT_M:
-            case FUNIT_KM:
-                eUnit = FUNIT_CM;
+            case FieldUnit::M:
+            case FieldUnit::KM:
+                eUnit = FieldUnit::CM;
                 break;
 
-            case FUNIT_FOOT:
-            case FUNIT_MILE:
-                eUnit = FUNIT_INCH;
+            case FieldUnit::FOOT:
+            case FieldUnit::MILE:
+                eUnit = FieldUnit::INCH;
                 break;
             default: ;//prevent warning
         }
@@ -100,14 +100,14 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll )
     rField.SetUnit( eUnit );
     switch( eUnit )
     {
-        // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FUNIT_MM
-        case FUNIT_CHAR:
-        case FUNIT_LINE:
-        case FUNIT_MM:
+        // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FieldUnit::MM
+        case FieldUnit::CHAR:
+        case FieldUnit::LINE:
+        case FieldUnit::MM:
             rField.SetSpinSize( 50 );
             break;
 
-        case FUNIT_INCH:
+        case FieldUnit::INCH:
             rField.SetSpinSize( 2 );
             break;
 
@@ -115,7 +115,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll )
             rField.SetSpinSize( 10 );
     }
 
-    if ( FUNIT_POINT == eUnit )
+    if ( FieldUnit::POINT == eUnit )
     {
         if( rField.GetDecimalDigits() > 1 )
             rField.SetDecimalDigits( 1 );
@@ -125,10 +125,10 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll )
 
     if ( !bAll )
     {
-        rField.SetFirst( rField.Normalize( nFirst ), FUNIT_TWIP );
-        rField.SetLast( rField.Normalize( nLast ), FUNIT_TWIP );
-        rField.SetMin( rField.Normalize( nMin ), FUNIT_TWIP );
-        rField.SetMax( rField.Normalize( nMax ), FUNIT_TWIP );
+        rField.SetFirst( rField.Normalize( nFirst ), FieldUnit::TWIP );
+        rField.SetLast( rField.Normalize( nLast ), FieldUnit::TWIP );
+        rField.SetMin( rField.Normalize( nMin ), FieldUnit::TWIP );
+        rField.SetMax( rField.Normalize( nMax ), FieldUnit::TWIP );
     }
 }
 
@@ -136,20 +136,20 @@ void SetMetricValue(weld::MetricSpinButton& rField, int nCoreValue, MapUnit eUni
 {
     auto nVal = OutputDevice::LogicToLogic(nCoreValue, eUnit, MapUnit::Map100thMM);
     nVal = rField.normalize(nVal);
-    rField.set_value(nVal, FUNIT_100TH_MM);
+    rField.set_value(nVal, FieldUnit::MM_100TH);
 }
 
 void SetMetricValue( MetricField& rField, long nCoreValue, MapUnit eUnit )
 {
     sal_Int64 nVal = OutputDevice::LogicToLogic( nCoreValue, eUnit, MapUnit::Map100thMM );
     nVal = rField.Normalize( nVal );
-    rField.SetValue( nVal, FUNIT_100TH_MM );
+    rField.SetValue(nVal, FieldUnit::MM_100TH);
 
 }
 
 int GetCoreValue(const weld::MetricSpinButton& rField, MapUnit eUnit)
 {
-    int nVal = rField.get_value(FUNIT_100TH_MM);
+    int nVal = rField.get_value(FieldUnit::MM_100TH);
     // avoid rounding issues
     const int nSizeMask = 0xff000000;
     bool bRoundBefore = true;
@@ -173,7 +173,7 @@ int GetCoreValue(const weld::MetricSpinButton& rField, MapUnit eUnit)
 
 long GetCoreValue( const MetricField& rField, MapUnit eUnit )
 {
-    sal_Int64 nVal = rField.GetValue( FUNIT_100TH_MM );
+    sal_Int64 nVal = rField.GetValue(FieldUnit::MM_100TH);
     // avoid rounding issues
     const sal_Int64 nSizeMask = 0xffffffffff000000LL;
     bool bRoundBefore = true;
@@ -240,13 +240,13 @@ long ItemToControl( long nIn, MapUnit eItem, FieldUnit eCtrl )
                 nIn /= 10;
             else if ( eItem == MapUnit::Map100thMM )
                 nIn /= 100;
-            nOut = TransformMetric( nIn, FUNIT_MM, eCtrl );
+            nOut = TransformMetric( nIn, FieldUnit::MM, eCtrl );
         }
         break;
 
         case MapUnit::MapCM:
         {
-            nOut = TransformMetric( nIn, FUNIT_CM, eCtrl );
+            nOut = TransformMetric( nIn, FieldUnit::CM, eCtrl );
         }
         break;
 
@@ -261,19 +261,19 @@ long ItemToControl( long nIn, MapUnit eItem, FieldUnit eCtrl )
                 nIn /= 100;
             else if ( eItem == MapUnit::Map1000thInch )
                 nIn /= 1000;
-            nOut = TransformMetric( nIn, FUNIT_INCH, eCtrl );
+            nOut = TransformMetric( nIn, FieldUnit::INCH, eCtrl );
         }
         break;
 
         case MapUnit::MapPoint:
         {
-            nOut = TransformMetric( nIn, FUNIT_POINT, eCtrl );
+            nOut = TransformMetric( nIn, FieldUnit::POINT, eCtrl );
         }
         break;
 
         case MapUnit::MapTwip:
         {
-            nOut = TransformMetric( nIn, FUNIT_TWIP, eCtrl );
+            nOut = TransformMetric( nIn, FieldUnit::TWIP, eCtrl );
         }
         break;
         default: ;//prevent warning
@@ -295,25 +295,25 @@ FieldUnit MapToFieldUnit( const MapUnit eUnit )
         case MapUnit::Map100thMM:
         case MapUnit::Map10thMM:
         case MapUnit::MapMM:
-            return FUNIT_MM;
+            return FieldUnit::MM;
 
         case MapUnit::MapCM:
-            return FUNIT_CM;
+            return FieldUnit::CM;
 
         case MapUnit::Map1000thInch:
         case MapUnit::Map100thInch:
         case MapUnit::Map10thInch:
         case MapUnit::MapInch:
-            return FUNIT_INCH;
+            return FieldUnit::INCH;
 
         case MapUnit::MapPoint:
-            return FUNIT_POINT;
+            return FieldUnit::POINT;
 
         case MapUnit::MapTwip:
-            return FUNIT_TWIP;
+            return FieldUnit::TWIP;
         default: ;//prevent warning
     }
-    return FUNIT_NONE;
+    return FieldUnit::NONE;
 }
 
 
@@ -650,8 +650,8 @@ FUNC_CONVERT const ConvertTable[6][6] =
 
 long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew )
 {
-    if ( aOld == FUNIT_NONE   || aNew == FUNIT_NONE ||
-         aOld == FUNIT_CUSTOM || aNew == FUNIT_CUSTOM )
+    if ( aOld == FieldUnit::NONE   || aNew == FieldUnit::NONE ||
+         aOld == FieldUnit::CUSTOM || aNew == FieldUnit::CUSTOM )
     {
         return nVal;
     }
@@ -661,34 +661,34 @@ long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew )
 
     switch ( aOld )
     {
-        case FUNIT_CM:
+        case FieldUnit::CM:
             nOld = 0; break;
-        case FUNIT_MM:
+        case FieldUnit::MM:
             nOld = 1; break;
-        case FUNIT_INCH:
+        case FieldUnit::INCH:
             nOld = 2; break;
-        case FUNIT_POINT:
+        case FieldUnit::POINT:
             nOld = 3; break;
-        case FUNIT_PICA:
+        case FieldUnit::PICA:
             nOld = 4; break;
-        case FUNIT_TWIP:
+        case FieldUnit::TWIP:
             nOld = 5; break;
         default: ;//prevent warning
     }
 
     switch ( aNew )
     {
-        case FUNIT_CM:
+        case FieldUnit::CM:
             nNew = 0; break;
-        case FUNIT_MM:
+        case FieldUnit::MM:
             nNew = 1; break;
-        case FUNIT_INCH:
+        case FieldUnit::INCH:
             nNew = 2; break;
-        case FUNIT_POINT:
+        case FieldUnit::POINT:
             nNew = 3; break;
-        case FUNIT_PICA:
+        case FieldUnit::PICA:
             nNew = 4; break;
-        case FUNIT_TWIP:
+        case FieldUnit::TWIP:
             nNew = 5; break;
         default: ;//prevent warning
     }