7 files changed, 14 insertions, 22 deletions
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 5c2fc3366acc..3b9873df8dd3 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -363,7 +363,7 @@ SvtAccessibilityOptions::SvtAccessibilityOptions()
         if(!sm_pSingleImplConfig)
         {
             sm_pSingleImplConfig = new SvtAccessibilityOptions_Impl;
-            svtools::ItemHolder2::holdConfigItem(E_ACCESSIBILITYOPTIONS);
+            svtools::ItemHolder2::holdConfigItem(EItem::AccessibilityOptions);
         }
         ++sm_nAccessibilityRefCount;
     }
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 73a7339d5c1d..02389ddd4601 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -376,7 +376,7 @@ ColorConfig::ColorConfig()
     if ( !m_pImpl )
     {
         m_pImpl = new ColorConfig_Impl;
-        svtools::ItemHolder2::holdConfigItem(E_COLORCFG);
+        svtools::ItemHolder2::holdConfigItem(EItem::ColorConfig);
     }
     ++nColorRefCount_Impl;
     m_pImpl->AddListener(this);
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index b3d93847a7e8..3f34fa1ba25d 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -266,7 +266,7 @@ SvtHelpOptions::SvtHelpOptions()
     {
         pImpl = std::make_shared<SvtHelpOptions_Impl>();
         g_pHelpOptions = pImpl;
-        svtools::ItemHolder2::holdConfigItem(E_HELPOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(EItem::HelpOptions);
     }
 }
 
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 81cc65621965..638120cf1515 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -133,39 +133,31 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
 {
     switch(rItem.eItem)
     {
-        case E_ACCESSIBILITYOPTIONS :
+        case EItem::AccessibilityOptions :
             rItem.pItem = new SvtAccessibilityOptions();
             break;
 
-        case E_APEARCFG :
-// no ref count            rItem.pItem = new SvtTabAppearanceCfg();
-            break;
-
-        case E_COLORCFG :
+        case EItem::ColorConfig :
             rItem.pItem = new ::svtools::ColorConfig();
             break;
 
-        case E_FONTSUBSTCONFIG :
-// no ref count            rItem.pItem = new SvtFontSubstConfig();
-            break;
-
-        case E_HELPOPTIONS :
+        case EItem::HelpOptions :
             rItem.pItem = new SvtHelpOptions();
             break;
 
-        case E_MENUOPTIONS :
+        case EItem::MenuOptions :
             rItem.pItem = new SvtMenuOptions();
             break;
 
-        case E_PRINTOPTIONS :
+        case EItem::PrintOptions :
             rItem.pItem = new SvtPrinterOptions();
             break;
 
-        case E_PRINTFILEOPTIONS :
+        case EItem::PrintFileOptions :
             rItem.pItem = new SvtPrintFileOptions();
             break;
 
-        case E_MISCOPTIONS :
+        case EItem::MiscOptions :
             rItem.pItem = new SvtMiscOptions();
             break;
 
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index d00632515ab1..cc8b64b760bc 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -358,7 +358,7 @@ SvtMenuOptions::SvtMenuOptions()
     {
         m_pImpl = std::make_shared<SvtMenuOptions_Impl>();
         g_pMenuOptions = m_pImpl;
-        svtools::ItemHolder2::holdConfigItem(E_MENUOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(EItem::MenuOptions);
     }
 }
 
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index e0cc26f1eb1f..f7e4e98f8c66 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -754,7 +754,7 @@ SvtMiscOptions::SvtMiscOptions()
     {
         m_pImpl = std::make_shared<SvtMiscOptions_Impl>();
         g_pMiscOptions = m_pImpl;
-        svtools::ItemHolder2::holdConfigItem(E_MISCOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(EItem::MiscOptions);
     }
 }
 
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 34f2bb96a9e4..be4a73644d4d 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -721,7 +721,7 @@ SvtPrinterOptions::SvtPrinterOptions()
         OUString aRootPath( ROOTNODE_START );
         m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += "/Printer" );
         pPrinterOptionsDataContainer = m_pStaticDataContainer;
-        svtools::ItemHolder2::holdConfigItem(E_PRINTOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(EItem::PrintOptions);
     }
 
     SetDataContainer( m_pStaticDataContainer );
@@ -756,7 +756,7 @@ SvtPrintFileOptions::SvtPrintFileOptions()
         m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath += "/File" );
         pPrintFileOptionsDataContainer = m_pStaticDataContainer;
 
-        svtools::ItemHolder2::holdConfigItem(E_PRINTFILEOPTIONS);
+        svtools::ItemHolder2::holdConfigItem(EItem::PrintFileOptions);
     }
 
     SetDataContainer( m_pStaticDataContainer );