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 /include/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 'include/vcl')
-rw-r--r-- | include/vcl/helper.hxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx index 34271cae690e..dcdcd923ba18 100644 --- a/include/vcl/helper.hxx +++ b/include/vcl/helper.hxx @@ -31,7 +31,9 @@ // forwards namespace osl { class File; } -namespace psp { +namespace psp +{ + typedef int fontID; void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir ); @@ -49,10 +51,11 @@ void VCL_DLLPUBLIC normPath( OString& rPath ); // rOrgPath will be subject to normPath void VCL_DLLPUBLIC splitPath( OString& rOrgPath, OString& rDir, OString& rBase ); -enum whichOfficePath { InstallationRootPath, UserPath, ConfigPath }; +enum class whichOfficePath { InstallationRootPath, UserPath, ConfigPath }; // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath ); +OUString VCL_DLLPUBLIC getOfficePath( whichOfficePath ePath ); + } // namespace |