convert SvtPathOptions::Paths to scoped enum

Change-Id: I2e6cab798309a1bc2ade00661bc95dd5ae20f748
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107045
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 158 insertions, 164 deletions

diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index c19df2979057..c24d7daf8388 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -93,7 +93,7 @@ public:
                     SvtDefaultOptions_Impl();
                     virtual ~SvtDefaultOptions_Impl() override;
 
-    OUString         GetDefaultPath( sal_uInt16 nId ) const;
+    OUString        GetDefaultPath( SvtPathOptions::Paths nId ) const;
     virtual void    Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
 
 private:
@@ -122,28 +122,28 @@ struct PathToDefaultMapping_Impl
 
 PathToDefaultMapping_Impl const PathMap_Impl[] =
 {
-    { SvtPathOptions::PATH_ADDIN,           &SvtDefaultOptions_Impl::m_aAddinPath },
-    { SvtPathOptions::PATH_AUTOCORRECT,     &SvtDefaultOptions_Impl::m_aAutoCorrectPath },
-    { SvtPathOptions::PATH_AUTOTEXT,        &SvtDefaultOptions_Impl::m_aAutoTextPath },
-    { SvtPathOptions::PATH_BACKUP,          &SvtDefaultOptions_Impl::m_aBackupPath },
-    { SvtPathOptions::PATH_BASIC,           &SvtDefaultOptions_Impl::m_aBasicPath },
-    { SvtPathOptions::PATH_BITMAP,          &SvtDefaultOptions_Impl::m_aBitmapPath },
-    { SvtPathOptions::PATH_CONFIG,          &SvtDefaultOptions_Impl::m_aConfigPath },
-    { SvtPathOptions::PATH_DICTIONARY,      &SvtDefaultOptions_Impl::m_aDictionaryPath },
-    { SvtPathOptions::PATH_FAVORITES,       &SvtDefaultOptions_Impl::m_aFavoritesPath },
-    { SvtPathOptions::PATH_FILTER,          &SvtDefaultOptions_Impl::m_aFilterPath },
-    { SvtPathOptions::PATH_GALLERY,         &SvtDefaultOptions_Impl::m_aGalleryPath },
-    { SvtPathOptions::PATH_GRAPHIC,         &SvtDefaultOptions_Impl::m_aGraphicPath },
-    { SvtPathOptions::PATH_HELP,            &SvtDefaultOptions_Impl::m_aHelpPath },
-    { SvtPathOptions::PATH_LINGUISTIC,      &SvtDefaultOptions_Impl::m_aLinguisticPath },
-    { SvtPathOptions::PATH_MODULE,          &SvtDefaultOptions_Impl::m_aModulePath },
-    { SvtPathOptions::PATH_PALETTE,         &SvtDefaultOptions_Impl::m_aPalettePath },
-    { SvtPathOptions::PATH_PLUGIN,          &SvtDefaultOptions_Impl::m_aPluginPath },
-    { SvtPathOptions::PATH_TEMP,            &SvtDefaultOptions_Impl::m_aTempPath },
-    { SvtPathOptions::PATH_TEMPLATE,        &SvtDefaultOptions_Impl::m_aTemplatePath },
-    { SvtPathOptions::PATH_USERCONFIG,      &SvtDefaultOptions_Impl::m_aUserConfigPath },
-    { SvtPathOptions::PATH_WORK,            &SvtDefaultOptions_Impl::m_aWorkPath },
-    { SvtPathOptions::PATH_CLASSIFICATION,  &SvtDefaultOptions_Impl::m_aClassificationPath }
+    { SvtPathOptions::Paths::AddIn,           &SvtDefaultOptions_Impl::m_aAddinPath },
+    { SvtPathOptions::Paths::AutoCorrect,     &SvtDefaultOptions_Impl::m_aAutoCorrectPath },
+    { SvtPathOptions::Paths::AutoText,        &SvtDefaultOptions_Impl::m_aAutoTextPath },
+    { SvtPathOptions::Paths::Backup,          &SvtDefaultOptions_Impl::m_aBackupPath },
+    { SvtPathOptions::Paths::Basic,           &SvtDefaultOptions_Impl::m_aBasicPath },
+    { SvtPathOptions::Paths::Bitmap,          &SvtDefaultOptions_Impl::m_aBitmapPath },
+    { SvtPathOptions::Paths::Config,          &SvtDefaultOptions_Impl::m_aConfigPath },
+    { SvtPathOptions::Paths::Dictionary,      &SvtDefaultOptions_Impl::m_aDictionaryPath },
+    { SvtPathOptions::Paths::Favorites,       &SvtDefaultOptions_Impl::m_aFavoritesPath },
+    { SvtPathOptions::Paths::Filter,          &SvtDefaultOptions_Impl::m_aFilterPath },
+    { SvtPathOptions::Paths::Gallery,         &SvtDefaultOptions_Impl::m_aGalleryPath },
+    { SvtPathOptions::Paths::Graphic,         &SvtDefaultOptions_Impl::m_aGraphicPath },
+    { SvtPathOptions::Paths::Help,            &SvtDefaultOptions_Impl::m_aHelpPath },
+    { SvtPathOptions::Paths::Linguistic,      &SvtDefaultOptions_Impl::m_aLinguisticPath },
+    { SvtPathOptions::Paths::Module,          &SvtDefaultOptions_Impl::m_aModulePath },
+    { SvtPathOptions::Paths::Palette,         &SvtDefaultOptions_Impl::m_aPalettePath },
+    { SvtPathOptions::Paths::Plugin,          &SvtDefaultOptions_Impl::m_aPluginPath },
+    { SvtPathOptions::Paths::Temp,            &SvtDefaultOptions_Impl::m_aTempPath },
+    { SvtPathOptions::Paths::Template,        &SvtDefaultOptions_Impl::m_aTemplatePath },
+    { SvtPathOptions::Paths::UserConfig,      &SvtDefaultOptions_Impl::m_aUserConfigPath },
+    { SvtPathOptions::Paths::Work,            &SvtDefaultOptions_Impl::m_aWorkPath },
+    { SvtPathOptions::Paths::Classification,  &SvtDefaultOptions_Impl::m_aClassificationPath }
 };
 
 // functions -------------------------------------------------------------
@@ -197,21 +197,21 @@ void SvtDefaultOptions_Impl::ImplCommit()
 
 // class SvtDefaultOptions_Impl ------------------------------------------
 
-OUString SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const
+OUString SvtDefaultOptions_Impl::GetDefaultPath( SvtPathOptions::Paths nId ) const
 {
     OUString aRet;
     sal_uInt16 nIdx = 0;
 
-    while ( PathMap_Impl[nIdx]._ePath <= SvtPathOptions::PATH_CLASSIFICATION )
+    while ( PathMap_Impl[nIdx]._ePath <= SvtPathOptions::Paths::Classification )
     {
         if ( nId == PathMap_Impl[nIdx]._ePath && PathMap_Impl[nIdx]._pDefaultPath )
         {
             aRet = this->*(PathMap_Impl[nIdx]._pDefaultPath);
-            if ( nId == SvtPathOptions::PATH_ADDIN ||
-                 nId == SvtPathOptions::PATH_FILTER ||
-                 nId == SvtPathOptions::PATH_HELP ||
-                 nId == SvtPathOptions::PATH_MODULE ||
-                 nId == SvtPathOptions::PATH_PLUGIN )
+            if ( nId == SvtPathOptions::Paths::AddIn ||
+                 nId == SvtPathOptions::Paths::Filter ||
+                 nId == SvtPathOptions::Paths::Help ||
+                 nId == SvtPathOptions::Paths::Module ||
+                 nId == SvtPathOptions::Paths::Plugin )
             {
                 OUString aTmp;
                 osl::FileBase::getFileURLFromSystemPath( aRet, aTmp );
@@ -349,7 +349,7 @@ SvtDefaultOptions::~SvtDefaultOptions()
     pImpl.reset();
 }
 
-OUString SvtDefaultOptions::GetDefaultPath( sal_uInt16 nId ) const
+OUString SvtDefaultOptions::GetDefaultPath( SvtPathOptions::Paths nId ) const
 {
     return pImpl->GetDefaultPath( nId );
 }
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index eb7d9244a897..59e8a978d0b1 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/util/XStringSubstitution.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <rtl/instance.hxx>
+#include <o3tl/enumarray.hxx>
 
 #include "itemholder1.hxx"
 
@@ -73,11 +74,11 @@ class SvtPathOptions_Impl
 {
     private:
         // Local variables to return const references
-        std::vector< OUString >             m_aPathArray;
+        o3tl::enumarray< SvtPathOptions::Paths, OUString > m_aPathArray;
         Reference< XFastPropertySet >       m_xPathSettings;
         Reference< XStringSubstitution >    m_xSubstVariables;
         Reference< XMacroExpander >         m_xMacroExpander;
-        mutable std::unordered_map<sal_Int32, sal_Int32>
+        mutable std::unordered_map<SvtPathOptions::Paths, sal_Int32>
                                             m_aMapEnumToPropHandle;
         VarNameSet                          m_aSystemPathVarNames;
 
@@ -89,58 +90,58 @@ class SvtPathOptions_Impl
 
         // get the paths, not const because of using a mutex
         const OUString& GetPath( SvtPathOptions::Paths );
-        const OUString& GetAddinPath() { return GetPath( SvtPathOptions::PATH_ADDIN ); }
-        const OUString& GetAutoCorrectPath() { return GetPath( SvtPathOptions::PATH_AUTOCORRECT ); }
-        const OUString& GetAutoTextPath() { return GetPath( SvtPathOptions::PATH_AUTOTEXT ); }
-        const OUString& GetBackupPath() { return GetPath( SvtPathOptions::PATH_BACKUP ); }
-        const OUString& GetBasicPath() { return GetPath( SvtPathOptions::PATH_BASIC ); }
-        const OUString& GetBitmapPath() { return GetPath( SvtPathOptions::PATH_BITMAP ); }
-        const OUString& GetConfigPath() { return GetPath( SvtPathOptions::PATH_CONFIG ); }
-        const OUString& GetDictionaryPath() { return GetPath( SvtPathOptions::PATH_DICTIONARY ); }
-        const OUString& GetFavoritesPath() { return GetPath( SvtPathOptions::PATH_FAVORITES ); }
-        const OUString& GetFilterPath() { return GetPath( SvtPathOptions::PATH_FILTER ); }
-        const OUString& GetGalleryPath() { return GetPath( SvtPathOptions::PATH_GALLERY ); }
-        const OUString& GetGraphicPath() { return GetPath( SvtPathOptions::PATH_GRAPHIC ); }
-        const OUString& GetHelpPath() { return GetPath( SvtPathOptions::PATH_HELP ); }
-        const OUString& GetLinguisticPath() { return GetPath( SvtPathOptions::PATH_LINGUISTIC ); }
-        const OUString& GetModulePath() { return GetPath( SvtPathOptions::PATH_MODULE ); }
-        const OUString& GetPalettePath() { return GetPath( SvtPathOptions::PATH_PALETTE ); }
-        const OUString& GetIconsetPath() { return GetPath( SvtPathOptions::PATH_ICONSET); }
-        const OUString& GetPluginPath() { return GetPath( SvtPathOptions::PATH_PLUGIN ); }
-        const OUString& GetStoragePath() { return GetPath( SvtPathOptions::PATH_STORAGE ); }
-        const OUString& GetTempPath() { return GetPath( SvtPathOptions::PATH_TEMP ); }
-        const OUString& GetTemplatePath() { return GetPath( SvtPathOptions::PATH_TEMPLATE ); }
-        const OUString& GetUserConfigPath() { return GetPath( SvtPathOptions::PATH_USERCONFIG ); }
-        const OUString& GetWorkPath() { return GetPath( SvtPathOptions::PATH_WORK ); }
-        const OUString& GetUIConfigPath() { return GetPath( SvtPathOptions::PATH_UICONFIG ); }
-        const OUString& GetFingerprintPath() { return GetPath( SvtPathOptions::PATH_FINGERPRINT ); }
-        const OUString& GetNumbertextPath() { return GetPath( SvtPathOptions::PATH_NUMBERTEXT ); }
-        const OUString& GetClassificationPath() { return GetPath( SvtPathOptions::PATH_CLASSIFICATION ); }
+        const OUString& GetAddinPath() { return GetPath( SvtPathOptions::Paths::AddIn ); }
+        const OUString& GetAutoCorrectPath() { return GetPath( SvtPathOptions::Paths::AutoCorrect ); }
+        const OUString& GetAutoTextPath() { return GetPath( SvtPathOptions::Paths::AutoText ); }
+        const OUString& GetBackupPath() { return GetPath( SvtPathOptions::Paths::Backup ); }
+        const OUString& GetBasicPath() { return GetPath( SvtPathOptions::Paths::Basic ); }
+        const OUString& GetBitmapPath() { return GetPath( SvtPathOptions::Paths::Bitmap ); }
+        const OUString& GetConfigPath() { return GetPath( SvtPathOptions::Paths::Config ); }
+        const OUString& GetDictionaryPath() { return GetPath( SvtPathOptions::Paths::Dictionary ); }
+        const OUString& GetFavoritesPath() { return GetPath( SvtPathOptions::Paths::Favorites ); }
+        const OUString& GetFilterPath() { return GetPath( SvtPathOptions::Paths::Filter ); }
+        const OUString& GetGalleryPath() { return GetPath( SvtPathOptions::Paths::Gallery ); }
+        const OUString& GetGraphicPath() { return GetPath( SvtPathOptions::Paths::Graphic ); }
+        const OUString& GetHelpPath() { return GetPath( SvtPathOptions::Paths::Help ); }
+        const OUString& GetLinguisticPath() { return GetPath( SvtPathOptions::Paths::Linguistic ); }
+        const OUString& GetModulePath() { return GetPath( SvtPathOptions::Paths::Module ); }
+        const OUString& GetPalettePath() { return GetPath( SvtPathOptions::Paths::Palette ); }
+        const OUString& GetIconsetPath() { return GetPath( SvtPathOptions::Paths::IconSet); }
+        const OUString& GetPluginPath() { return GetPath( SvtPathOptions::Paths::Plugin ); }
+        const OUString& GetStoragePath() { return GetPath( SvtPathOptions::Paths::Storage ); }
+        const OUString& GetTempPath() { return GetPath( SvtPathOptions::Paths::Temp ); }
+        const OUString& GetTemplatePath() { return GetPath( SvtPathOptions::Paths::Template ); }
+        const OUString& GetUserConfigPath() { return GetPath( SvtPathOptions::Paths::UserConfig ); }
+        const OUString& GetWorkPath() { return GetPath( SvtPathOptions::Paths::Work ); }
+        const OUString& GetUIConfigPath() { return GetPath( SvtPathOptions::Paths::UIConfig ); }
+        const OUString& GetFingerprintPath() { return GetPath( SvtPathOptions::Paths::Fingerprint ); }
+        const OUString& GetNumbertextPath() { return GetPath( SvtPathOptions::Paths::NumberText ); }
+        const OUString& GetClassificationPath() { return GetPath( SvtPathOptions::Paths::Classification ); }
 
         // set the paths
         void            SetPath( SvtPathOptions::Paths, const OUString& rNewPath );
-        void            SetAddinPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_ADDIN, rPath ); }
-        void            SetAutoCorrectPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_AUTOCORRECT, rPath ); }
-        void            SetAutoTextPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_AUTOTEXT, rPath ); }
-        void            SetBackupPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_BACKUP, rPath ); }
-        void            SetBasicPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_BASIC, rPath ); }
-        void            SetBitmapPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_BITMAP, rPath ); }
-        void            SetConfigPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_CONFIG, rPath ); }
-        void            SetDictionaryPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_DICTIONARY, rPath ); }
-        void            SetFavoritesPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_FAVORITES, rPath ); }
-        void            SetFilterPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_FILTER, rPath ); }
-        void            SetGalleryPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_GALLERY, rPath ); }
-        void            SetGraphicPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_GRAPHIC, rPath ); }
-        void            SetHelpPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_HELP, rPath ); }
-        void            SetLinguisticPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_LINGUISTIC, rPath ); }
-        void            SetModulePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_MODULE, rPath ); }
-        void            SetPalettePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_PALETTE, rPath ); }
-        void            SetPluginPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_PLUGIN, rPath ); }
-        void            SetStoragePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_STORAGE, rPath ); }
-        void            SetTempPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_TEMP, rPath ); }
-        void            SetTemplatePath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_TEMPLATE, rPath ); }
-        void            SetUserConfigPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); }
-        void            SetWorkPath( const OUString& rPath ) { SetPath( SvtPathOptions::PATH_WORK, rPath ); }
+        void            SetAddinPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::AddIn, rPath ); }
+        void            SetAutoCorrectPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::AutoCorrect, rPath ); }
+        void            SetAutoTextPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::AutoText, rPath ); }
+        void            SetBackupPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Backup, rPath ); }
+        void            SetBasicPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Basic, rPath ); }
+        void            SetBitmapPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Bitmap, rPath ); }
+        void            SetConfigPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Config, rPath ); }
+        void            SetDictionaryPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Dictionary, rPath ); }
+        void            SetFavoritesPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Favorites, rPath ); }
+        void            SetFilterPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Filter, rPath ); }
+        void            SetGalleryPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Gallery, rPath ); }
+        void            SetGraphicPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Graphic, rPath ); }
+        void            SetHelpPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Help, rPath ); }
+        void            SetLinguisticPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Linguistic, rPath ); }
+        void            SetModulePath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Module, rPath ); }
+        void            SetPalettePath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Palette, rPath ); }
+        void            SetPluginPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Plugin, rPath ); }
+        void            SetStoragePath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Storage, rPath ); }
+        void            SetTempPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Temp, rPath ); }
+        void            SetTemplatePath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Template, rPath ); }
+        void            SetUserConfigPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::UserConfig, rPath ); }
+        void            SetWorkPath( const OUString& rPath ) { SetPath( SvtPathOptions::Paths::Work, rPath ); }
 
         OUString   SubstVar( const OUString& rVar ) const;
         OUString   ExpandMacros( const OUString& rPath ) const;
@@ -169,33 +170,33 @@ struct VarNameAttribute
 
 const PropertyStruct aPropNames[] =
 {
-    { "Addin",          SvtPathOptions::PATH_ADDIN          },
-    { "AutoCorrect",    SvtPathOptions::PATH_AUTOCORRECT    },
-    { "AutoText",       SvtPathOptions::PATH_AUTOTEXT       },
-    { "Backup",         SvtPathOptions::PATH_BACKUP         },
-    { "Basic",          SvtPathOptions::PATH_BASIC          },
-    { "Bitmap",         SvtPathOptions::PATH_BITMAP         },
-    { "Config",         SvtPathOptions::PATH_CONFIG         },
-    { "Dictionary",     SvtPathOptions::PATH_DICTIONARY     },
-    { "Favorite",       SvtPathOptions::PATH_FAVORITES      },
-    { "Filter",         SvtPathOptions::PATH_FILTER         },
-    { "Gallery",        SvtPathOptions::PATH_GALLERY        },
-    { "Graphic",        SvtPathOptions::PATH_GRAPHIC        },
-    { "Help",           SvtPathOptions::PATH_HELP           },
-    { "Iconset",        SvtPathOptions::PATH_ICONSET        },
-    { "Linguistic",     SvtPathOptions::PATH_LINGUISTIC     },
-    { "Module",         SvtPathOptions::PATH_MODULE         },
-    { "Palette",        SvtPathOptions::PATH_PALETTE        },
-    { "Plugin",         SvtPathOptions::PATH_PLUGIN         },
-    { "Storage",        SvtPathOptions::PATH_STORAGE        },
-    { "Temp",           SvtPathOptions::PATH_TEMP           },
-    { "Template",       SvtPathOptions::PATH_TEMPLATE       },
-    { "UserConfig",     SvtPathOptions::PATH_USERCONFIG     },
-    { "Work",           SvtPathOptions::PATH_WORK           },
-    { "UIConfig",       SvtPathOptions::PATH_UICONFIG       },
-    { "Fingerprint",    SvtPathOptions::PATH_FINGERPRINT    },
-    { "Numbertext",     SvtPathOptions::PATH_NUMBERTEXT     },
-    { "Classification", SvtPathOptions::PATH_CLASSIFICATION }
+    { "Addin",          SvtPathOptions::Paths::AddIn          },
+    { "AutoCorrect",    SvtPathOptions::Paths::AutoCorrect    },
+    { "AutoText",       SvtPathOptions::Paths::AutoText       },
+    { "Backup",         SvtPathOptions::Paths::Backup         },
+    { "Basic",          SvtPathOptions::Paths::Basic          },
+    { "Bitmap",         SvtPathOptions::Paths::Bitmap         },
+    { "Config",         SvtPathOptions::Paths::Config         },
+    { "Dictionary",     SvtPathOptions::Paths::Dictionary     },
+    { "Favorite",       SvtPathOptions::Paths::Favorites      },
+    { "Filter",         SvtPathOptions::Paths::Filter         },
+    { "Gallery",        SvtPathOptions::Paths::Gallery        },
+    { "Graphic",        SvtPathOptions::Paths::Graphic        },
+    { "Help",           SvtPathOptions::Paths::Help           },
+    { "Iconset",        SvtPathOptions::Paths::IconSet        },
+    { "Linguistic",     SvtPathOptions::Paths::Linguistic     },
+    { "Module",         SvtPathOptions::Paths::Module         },
+    { "Palette",        SvtPathOptions::Paths::Palette        },
+    { "Plugin",         SvtPathOptions::Paths::Plugin         },
+    { "Storage",        SvtPathOptions::Paths::Storage        },
+    { "Temp",           SvtPathOptions::Paths::Temp           },
+    { "Template",       SvtPathOptions::Paths::Template       },
+    { "UserConfig",     SvtPathOptions::Paths::UserConfig     },
+    { "Work",           SvtPathOptions::Paths::Work           },
+    { "UIConfig",       SvtPathOptions::Paths::UIConfig       },
+    { "Fingerprint",    SvtPathOptions::Paths::Fingerprint    },
+    { "Numbertext",     SvtPathOptions::Paths::NumberText     },
+    { "Classification", SvtPathOptions::Paths::Classification }
 };
 
 const VarNameAttribute aVarNameAttribute[] =
@@ -210,25 +211,22 @@ const VarNameAttribute aVarNameAttribute[] =
 
 const OUString& SvtPathOptions_Impl::GetPath( SvtPathOptions::Paths ePath )
 {
-    if ( ePath >= SvtPathOptions::PATH_COUNT )
-        return m_aEmptyString;
-
     ::osl::MutexGuard aGuard( m_aMutex );
 
     try
     {
         OUString    aPathValue;
-        sal_Int32   nHandle = m_aMapEnumToPropHandle[ static_cast<sal_Int32>(ePath) ];
+        sal_Int32   nHandle = m_aMapEnumToPropHandle[ePath];
 
         // Substitution is done by the service itself using the substitution service
         Any         a = m_xPathSettings->getFastPropertyValue( nHandle );
         a >>= aPathValue;
-        if( ePath == SvtPathOptions::PATH_ADDIN     ||
-            ePath == SvtPathOptions::PATH_FILTER    ||
-            ePath == SvtPathOptions::PATH_HELP      ||
-            ePath == SvtPathOptions::PATH_MODULE    ||
-            ePath == SvtPathOptions::PATH_PLUGIN    ||
-            ePath == SvtPathOptions::PATH_STORAGE
+        if( ePath == SvtPathOptions::Paths::AddIn     ||
+            ePath == SvtPathOptions::Paths::Filter    ||
+            ePath == SvtPathOptions::Paths::Help      ||
+            ePath == SvtPathOptions::Paths::Module    ||
+            ePath == SvtPathOptions::Paths::Plugin    ||
+            ePath == SvtPathOptions::Paths::Storage
           )
         {
             // These office paths have to be converted to system pates
@@ -236,8 +234,8 @@ const OUString& SvtPathOptions_Impl::GetPath( SvtPathOptions::Paths ePath )
             osl::FileBase::getSystemPathFromFileURL( aPathValue, aResult );
             aPathValue = aResult;
         }
-        else if (ePath == SvtPathOptions::PATH_PALETTE ||
-                 ePath == SvtPathOptions::PATH_ICONSET)
+        else if (ePath == SvtPathOptions::Paths::Palette ||
+                 ePath == SvtPathOptions::Paths::IconSet)
         {
             auto ctx = comphelper::getProcessComponentContext();
             OUStringBuffer buf(aPathValue.getLength()*2);
@@ -268,21 +266,18 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString&
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    if ( ePath >= SvtPathOptions::PATH_COUNT )
-        return;
-
     OUString    aResult;
     OUString    aNewValue;
     Any         a;
 
     switch ( ePath )
     {
-        case SvtPathOptions::PATH_ADDIN:
-        case SvtPathOptions::PATH_FILTER:
-        case SvtPathOptions::PATH_HELP:
-        case SvtPathOptions::PATH_MODULE:
-        case SvtPathOptions::PATH_PLUGIN:
-        case SvtPathOptions::PATH_STORAGE:
+        case SvtPathOptions::Paths::AddIn:
+        case SvtPathOptions::Paths::Filter:
+        case SvtPathOptions::Paths::Help:
+        case SvtPathOptions::Paths::Module:
+        case SvtPathOptions::Paths::Plugin:
+        case SvtPathOptions::Paths::Storage:
         {
             // These office paths have to be convert back to UCB-URL's
             osl::FileBase::getFileURLFromSystemPath( rNewPath, aResult );
@@ -298,7 +293,7 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString&
     a <<= aNewValue;
     try
     {
-        m_xPathSettings->setFastPropertyValue( m_aMapEnumToPropHandle[ static_cast<sal_Int32>(ePath)], a );
+        m_xPathSettings->setFastPropertyValue( m_aMapEnumToPropHandle[ePath], a );
     }
     catch (const Exception&)
     {
@@ -395,8 +390,7 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const
     return aWorkText;
 }
 
-SvtPathOptions_Impl::SvtPathOptions_Impl() :
-    m_aPathArray( sal_Int32(SvtPathOptions::PATH_COUNT) )
+SvtPathOptions_Impl::SvtPathOptions_Impl()
 {
     Reference< XComponentContext > xContext = comphelper::getProcessComponentContext();
 
@@ -425,7 +419,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
         if ( pIter != aTempHashMap.end() )
         {
             sal_Int32 nHandle   = pIter->second;
-            sal_Int32 nEnum     = p.ePath;
+            SvtPathOptions::Paths nEnum       = p.ePath;
             m_aMapEnumToPropHandle.emplace( nEnum, nHandle );
         }
     }
@@ -717,7 +711,7 @@ OUString SvtPathOptions::UseVariable( const OUString& rPath ) const
     return pImpl->UsePathVariables( rPath );
 }
 
-bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath )
+bool SvtPathOptions::SearchFile( OUString& rIniFile, SvtPathOptions::Paths ePath )
 {
     // check parameter: empty inifile name?
     if ( rIniFile.isEmpty() )
@@ -731,7 +725,7 @@ bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath )
 
     switch ( ePath )
     {
-        case PATH_USERCONFIG:
+        case SvtPathOptions::Paths::UserConfig:
         {
             // path is a URL
             bRet = true;
@@ -763,35 +757,35 @@ bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath )
             OUString aPath;
             switch ( ePath )
             {
-                case PATH_ADDIN:        aPath = GetAddinPath();         break;
-                case PATH_AUTOCORRECT:  aPath = GetAutoCorrectPath();   break;
-                case PATH_AUTOTEXT:     aPath = GetAutoTextPath();      break;
-                case PATH_BACKUP:       aPath = GetBackupPath();        break;
-                case PATH_BASIC:        aPath = GetBasicPath();         break;
-                case PATH_BITMAP:       aPath = GetBitmapPath();        break;
-                case PATH_CONFIG:       aPath = GetConfigPath();        break;
-                case PATH_DICTIONARY:   aPath = GetDictionaryPath();    break;
-                case PATH_FAVORITES:    aPath = GetFavoritesPath();     break;
-                case PATH_FILTER:       aPath = GetFilterPath();        break;
-                case PATH_GALLERY:      aPath = GetGalleryPath();       break;
-                case PATH_GRAPHIC:      aPath = GetGraphicPath();       break;
-                case PATH_HELP:         aPath = GetHelpPath();          break;
-                case PATH_LINGUISTIC:   aPath = GetLinguisticPath();    break;
-                case PATH_MODULE:       aPath = GetModulePath();        break;
-                case PATH_PALETTE:      aPath = GetPalettePath();       break;
-                case PATH_ICONSET:      aPath = GetIconsetPath();       break;
-                case PATH_PLUGIN:       aPath = GetPluginPath();        break;
-                case PATH_STORAGE:      aPath = GetStoragePath();       break;
-                case PATH_TEMP:         aPath = GetTempPath();          break;
-                case PATH_TEMPLATE:     aPath = GetTemplatePath();      break;
-                case PATH_WORK:         aPath = GetWorkPath();          break;
-                case PATH_UICONFIG:     aPath = pImpl->GetUIConfigPath(); break;
-                case PATH_FINGERPRINT:  aPath = GetFingerprintPath();   break;
-                case PATH_NUMBERTEXT:   aPath = GetNumbertextPath();    break;
-                case PATH_CLASSIFICATION: aPath = GetClassificationPath(); break;
+                case SvtPathOptions::Paths::AddIn:        aPath = GetAddinPath();         break;
+                case SvtPathOptions::Paths::AutoCorrect:  aPath = GetAutoCorrectPath();   break;
+                case SvtPathOptions::Paths::AutoText:     aPath = GetAutoTextPath();      break;
+                case SvtPathOptions::Paths::Backup:       aPath = GetBackupPath();        break;
+                case SvtPathOptions::Paths::Basic:        aPath = GetBasicPath();         break;
+                case SvtPathOptions::Paths::Bitmap:       aPath = GetBitmapPath();        break;
+                case SvtPathOptions::Paths::Config:       aPath = GetConfigPath();        break;
+                case SvtPathOptions::Paths::Dictionary:   aPath = GetDictionaryPath();    break;
+                case SvtPathOptions::Paths::Favorites:    aPath = GetFavoritesPath();     break;
+                case SvtPathOptions::Paths::Filter:       aPath = GetFilterPath();        break;
+                case SvtPathOptions::Paths::Gallery:      aPath = GetGalleryPath();       break;
+                case SvtPathOptions::Paths::Graphic:      aPath = GetGraphicPath();       break;
+                case SvtPathOptions::Paths::Help:         aPath = GetHelpPath();          break;
+                case SvtPathOptions::Paths::Linguistic:   aPath = GetLinguisticPath();    break;
+                case SvtPathOptions::Paths::Module:       aPath = GetModulePath();        break;
+                case SvtPathOptions::Paths::Palette:      aPath = GetPalettePath();       break;
+                case SvtPathOptions::Paths::IconSet:      aPath = GetIconsetPath();       break;
+                case SvtPathOptions::Paths::Plugin:       aPath = GetPluginPath();        break;
+                case SvtPathOptions::Paths::Storage:      aPath = GetStoragePath();       break;
+                case SvtPathOptions::Paths::Temp:         aPath = GetTempPath();          break;
+                case SvtPathOptions::Paths::Template:     aPath = GetTemplatePath();      break;
+                case SvtPathOptions::Paths::Work:         aPath = GetWorkPath();          break;
+                case SvtPathOptions::Paths::UIConfig:     aPath = pImpl->GetUIConfigPath(); break;
+                case SvtPathOptions::Paths::Fingerprint:  aPath = GetFingerprintPath();   break;
+                case SvtPathOptions::Paths::NumberText:   aPath = GetNumbertextPath();    break;
+                case SvtPathOptions::Paths::Classification: aPath = GetClassificationPath(); break;
                 // coverity[dead_error_begin] - following conditions exist to avoid compiler warning
-                case PATH_USERCONFIG:
-                case PATH_COUNT:
+                case SvtPathOptions::Paths::UserConfig:
+                case SvtPathOptions::Paths::LAST:
                     break;
             }