diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-01 11:58:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-03 06:17:41 +0000 |
| commit | dfad705d5f0c05cbebb4155d69212b35c58a22c0 (patch) | |
| tree | 3e70dd4d125030425d48008ae9d110cec450287e /vcl | |
| parent | db4e8806aace921ca1348c1bc0949a7e554f34ac (diff) | |
Convert whichOfficePath to scoped enum
Change-Id: If31c00ac8820e6dfce5047e997c35f5e1878db6f
Reviewed-on: https://gerrit.libreoffice.org/25763
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontcache.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/helper.cxx | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx index 25526d82eb27..a4a1550b0a57 100644 --- a/vcl/unx/generic/fontmanager/fontcache.cxx +++ b/vcl/unx/generic/fontmanager/fontcache.cxx @@ -50,7 +50,7 @@ using namespace utl; FontCache::FontCache() { m_bDoFlush = false; - m_aCacheFile = getOfficePath( UserPath ); + m_aCacheFile = getOfficePath( whichOfficePath::UserPath ); if( !m_aCacheFile.isEmpty() ) { m_aCacheFile += "/user/psprint/pspfontcache"; diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx index a8c35b8a2147..8b7c2ed722b4 100644 --- a/vcl/unx/generic/fontmanager/helper.cxx +++ b/vcl/unx/generic/fontmanager/helper.cxx @@ -37,7 +37,7 @@ using ::rtl::Bootstrap; namespace psp { -OUString getOfficePath( enum whichOfficePath ePath ) +OUString getOfficePath( whichOfficePath ePath ) { static OUString aInstallationRootPath; static OUString aUserPath; @@ -87,9 +87,9 @@ OUString getOfficePath( enum whichOfficePath ePath ) switch( ePath ) { - case ConfigPath: return aConfigPath; - case InstallationRootPath: return aInstallationRootPath; - case UserPath: return aUserPath; + case whichOfficePath::ConfigPath: return aConfigPath; + case whichOfficePath::InstallationRootPath: return aInstallationRootPath; + case whichOfficePath::UserPath: return aUserPath; } return aEmpty; } @@ -116,7 +116,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub OUStringBuffer aPathBuffer( 256 ); // append net path - aPathBuffer.append( getOfficePath( psp::InstallationRootPath ) ); + aPathBuffer.append( getOfficePath( whichOfficePath::InstallationRootPath ) ); if( !aPathBuffer.isEmpty() ) { aPathBuffer.append( "/" LIBO_SHARE_FOLDER "/psprint" ); @@ -128,7 +128,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub rPathList.push_back( aPathBuffer.makeStringAndClear() ); } // append user path - aPathBuffer.append( getOfficePath( psp::UserPath ) ); + aPathBuffer.append( getOfficePath( whichOfficePath::UserPath ) ); if( !aPathBuffer.isEmpty() ) { aPathBuffer.append( "/user/psprint" ); @@ -193,9 +193,9 @@ OUString psp::getFontPath() { OUStringBuffer aPathBuffer( 512 ); - OUString aConfigPath( getOfficePath( psp::ConfigPath ) ); - OUString aInstallationRootPath( getOfficePath( psp::InstallationRootPath ) ); - OUString aUserPath( getOfficePath( psp::UserPath ) ); + OUString aConfigPath( getOfficePath( whichOfficePath::ConfigPath ) ); + OUString aInstallationRootPath( getOfficePath( whichOfficePath::InstallationRootPath ) ); + OUString aUserPath( getOfficePath( whichOfficePath::UserPath ) ); if( !aConfigPath.isEmpty() ) { // #i53530# Path from CustomDataUrl will completely |