diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-04 15:34:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-06 09:01:28 +0200 |
| commit | 9b37c2176e4da7575398c15921e3466208f19847 (patch) | |
| tree | fa2d103b3829c5a128a9058632c8c9224ca7abd7 /include/unotools | |
| parent | 78706545a6df37ccc57c21190f51e9081180ac70 (diff) | |
convert SUBSFONT_ to scoped enum
Change-Id: Ic66191ac4cdfa753dc784e7bd1a6dd20f50def6b
Diffstat (limited to 'include/unotools')
| -rw-r--r-- | include/unotools/fontdefs.hxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx index e0601063ac4b..763f7bf995af 100644 --- a/include/unotools/fontdefs.hxx +++ b/include/unotools/fontdefs.hxx @@ -24,6 +24,7 @@ #include <tools/solar.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> +#include <o3tl/typed_flags_set.hxx> namespace utl { class FontSubstConfiguration; @@ -32,12 +33,19 @@ namespace utl { // - SubsFontName - -#define SUBSFONT_ONLYONE ((sal_uLong)0x00000001) -#define SUBSFONT_MS ((sal_uLong)0x00000002) -#define SUBSFONT_PS ((sal_uLong)0x00000004) -#define SUBSFONT_HTML ((sal_uLong)0x00000008) +enum class SubsFontFlags +{ + ONLYONE = 0x01, + MS = 0x02, + PS = 0x04, + HTML = 0x08, +}; +namespace o3tl +{ + template<> struct typed_flags<SubsFontFlags> : is_typed_flags<SubsFontFlags, 0x0f> {}; +} -UNOTOOLS_DLLPUBLIC OUString GetSubsFontName( const OUString& rName, sal_uLong nFlags ); +UNOTOOLS_DLLPUBLIC OUString GetSubsFontName( const OUString& rName, SubsFontFlags nFlags ); UNOTOOLS_DLLPUBLIC void AddTokenFontName( OUString& rName, const OUString& rNewToken ); |