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 /unotools | |
| parent | 78706545a6df37ccc57c21190f51e9081180ac70 (diff) | |
convert SUBSFONT_ to scoped enum
Change-Id: Ic66191ac4cdfa753dc784e7bd1a6dd20f50def6b
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/misc/fontdefs.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index 9d3e2c7ec375..81b402b8f619 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -512,7 +512,7 @@ void AddTokenFontName( OUString& rName, const OUString& rNewToken ) ImplAppendFontToken( rName, rNewToken ); } -OUString GetSubsFontName( const OUString& rName, sal_uLong nFlags ) +OUString GetSubsFontName( const OUString& rName, SubsFontFlags nFlags ) { OUString aName; @@ -521,7 +521,7 @@ OUString GetSubsFontName( const OUString& rName, sal_uLong nFlags ) GetNextFontToken( rName, nIndex ) ); // #93662# do not try to replace StarSymbol with MS only font - if( nFlags == (SUBSFONT_MS|SUBSFONT_ONLYONE) + if( nFlags == (SubsFontFlags::MS|SubsFontFlags::ONLYONE) && ( aOrgName == "starsymbol" || aOrgName == "opensymbol" ) ) return aName; @@ -535,15 +535,15 @@ OUString GetSubsFontName( const OUString& rName, sal_uLong nFlags ) switch( i ) { case 0: - if( nFlags & SUBSFONT_MS && pAttr->MSSubstitutions.size() ) + if( nFlags & SubsFontFlags::MS && pAttr->MSSubstitutions.size() ) pVector = &pAttr->MSSubstitutions; break; case 1: - if( nFlags & SUBSFONT_PS && pAttr->PSSubstitutions.size() ) + if( nFlags & SubsFontFlags::PS && pAttr->PSSubstitutions.size() ) pVector = &pAttr->PSSubstitutions; break; case 2: - if( nFlags & SUBSFONT_HTML && pAttr->HTMLSubstitutions.size() ) + if( nFlags & SubsFontFlags::HTML && pAttr->HTMLSubstitutions.size() ) pVector = &pAttr->HTMLSubstitutions; break; } @@ -553,7 +553,7 @@ OUString GetSubsFontName( const OUString& rName, sal_uLong nFlags ) if( ! ImplIsFontToken( rName, *it ) ) { ImplAppendFontToken( aName, *it ); - if( nFlags & SUBSFONT_ONLYONE ) + if( nFlags & SubsFontFlags::ONLYONE ) { i = 4; break; |