From cc96c1fdc1b62f8b61567f5df63e892953c87f10 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 9 Feb 2017 12:36:22 +0200
Subject: convert EItem to scoped enum

and drop read-only enumerators:
    enum EItem E_APEARCFG
    enum EItem E_FLTRCFG
    enum EItem E_FONTSUBSTCONFIG
    enum EItem E_LANGUAGEOPTIONS
    enum EItem E_SEARCHOPT

Change-Id: Ie3baaecec3d1c30404b4fb0d948e25d4bb2f3f93
---
 svl/source/config/cjkoptions.cxx  | 2 +-
 svl/source/config/ctloptions.cxx  | 2 +-
 svl/source/config/itemholder2.cxx | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'svl/source')

diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index c1dede974434..405e8b93eb7c 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -389,7 +389,7 @@ SvtCJKOptions::SvtCJKOptions(bool bDontLoad)
     {
         pImpl = std::make_shared<SvtCJKOptions_Impl>();
         g_pCJKOptions = pImpl;
-        ItemHolder2::holdConfigItem(E_CJKOPTIONS);
+        ItemHolder2::holdConfigItem(EItem::CJKOptions);
     }
 
     if( !bDontLoad && !pImpl->IsLoaded())
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 3160af3651c1..c4fffc504560 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -354,7 +354,7 @@ SvtCTLOptions::SvtCTLOptions( bool bDontLoad )
     {
         m_pImpl = std::make_shared<SvtCTLOptions_Impl>();
         g_pCTLOptions = m_pImpl;
-        ItemHolder2::holdConfigItem(E_CTLOPTIONS);
+        ItemHolder2::holdConfigItem(EItem::CTLOptions);
     }
 
     if( !bDontLoad && !m_pImpl->IsLoaded() )
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index 27344aa60878..fc12e7681ce4 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -118,18 +118,14 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
 {
     switch(rItem.eItem)
     {
-        case E_CJKOPTIONS :
+        case EItem::CJKOptions :
             rItem.pItem = new SvtCJKOptions();
             break;
 
-        case E_CTLOPTIONS :
+        case EItem::CTLOptions :
             rItem.pItem = new SvtCTLOptions();
             break;
 
-        case E_LANGUAGEOPTIONS :
-// capsulate CTL and CJL options !            rItem.pItem = new SvtLanguageOptions();
-            break;
-
         default:
             OSL_ASSERT(false);
             break;
-- 
cgit