convert Lotus123Typ to scoped enum

and drop unused enumerators

Change-Id: I1658d05d3e79c0bbb1020a440b981723ba29bd4d

4 files changed, 11 insertions, 15 deletions

diff --git a/sc/source/filter/inc/flttypes.hxx b/sc/source/filter/inc/flttypes.hxx
index d939cac3cfd6..5f137e3532c5 100644
--- a/sc/source/filter/inc/flttypes.hxx
+++ b/sc/source/filter/inc/flttypes.hxx
@@ -30,13 +30,11 @@ enum BiffTyp
     Biff8 = 0x8000, Biff8W = 0x8001, Biff8V = 0x8002, Biff8C = 0x8004, Biff8M4 = 0x8008
 };
 
-enum Lotus123Typ
+enum class Lotus123Typ
 {
-    Lotus_X,
-    Lotus_WK1,
-    Lotus_WK3,
-    Lotus_WK4,
-    Lotus_FM3
+    X,
+    WK3,
+    WK4,
 };
 
 #endif
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 1d2786127e8d..9babc9354871 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -45,8 +45,8 @@ LOTUS_ROOT::LOTUS_ROOT( ScDocument* pDocP, rtl_TextEncoding eQ )
         pRangeNames( new LotusRangeList(this)),
         pScRangeName( pDocP->GetRangeName()),
         eCharsetQ( eQ),
-        eFirstType( Lotus_X),
-        eActType( Lotus_X),
+        eFirstType( Lotus123Typ::X),
+        eActType( Lotus123Typ::X),
         pRngNmBffWK3( new RangeNameBufferWK3(this)),
         pFontBuff( new LotusFontBuffer),
         pAttrTable( new LotAttrTable(this))
@@ -105,11 +105,11 @@ void ImportLotus::Bof()
     {
         if( nFileCode == 0x1000 )
         {// <= WK3
-            rContext.pLotusRoot->eFirstType = rContext.pLotusRoot->eActType = Lotus_WK3;
+            rContext.pLotusRoot->eFirstType = rContext.pLotusRoot->eActType = Lotus123Typ::WK3;
         }
         else if( nFileCode == 0x1002 )
         {// WK4
-            rContext.pLotusRoot->eFirstType = rContext.pLotusRoot->eActType = Lotus_WK4;
+            rContext.pLotusRoot->eFirstType = rContext.pLotusRoot->eActType = Lotus123Typ::WK4;
         }
     }
 }
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index 5e30fb56ad09..1a37631688c9 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -82,10 +82,8 @@ FltError ImportLotus::Read()
                     Bof();
                     switch (rContext.pLotusRoot->eFirstType)
                     {
-                        case Lotus_WK1: eAkt = S_WK1; break;
-                        case Lotus_WK3: eAkt = S_WK3; break;
-                        case Lotus_WK4: eAkt = S_WK4; break;
-                        case Lotus_FM3: eAkt = S_FM3; break;
+                        case Lotus123Typ::WK3: eAkt = S_WK3; break;
+                        case Lotus123Typ::WK4: eAkt = S_WK4; break;
                         default:
                         eRet = SCERR_IMPORT_UNKNOWN_WK;
                         eAkt = S_END;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 24524ba9d1b5..6afba99bdd4b 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -70,7 +70,7 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum
     if( eRet != eERR_OK )
         return eRet;
 
-    if (aContext.pLotusRoot->eFirstType == Lotus_WK3)
+    if (aContext.pLotusRoot->eFirstType == Lotus123Typ::WK3)
     {
         // try to load *.FM3 file
         INetURLObject aURL( rMedium.GetURLObject() );