diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-04 14:57:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-06 09:01:27 +0200 |
| commit | 78706545a6df37ccc57c21190f51e9081180ac70 (patch) | |
| tree | 15c0618a2310ac9154891c360d3282152e19a7ff /unotools | |
| parent | 60e659ae355d073b05b3b9c8d2ac3bdc5f76020d (diff) | |
convert FONTTOSUBSFONT constants to scoped enum
Change-Id: I994bfc76d709d01406404991dbfbd49b15bd03f4
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/misc/fontcvt.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index e1db618d65c0..a154e0529a08 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1455,29 +1455,34 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con return pCvt; } -FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName, sal_uLong nFlags ) +FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName, FontToSubsFontFlags nFlags ) { const ConvertChar* pCvt = NULL; OUString aName = GetEnglishSearchFontName( rOrgName ); - if ( nFlags & FONTTOSUBSFONT_IMPORT ) + if ( nFlags & FontToSubsFontFlags::IMPORT ) { int nEntries = SAL_N_ELEMENTS(aStarSymbolRecodeTable); - if ( nFlags & FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS ) // only StarMath+StarBats + if ( nFlags & FontToSubsFontFlags::ONLYOLDSOSYMBOLFONTS ) // only StarMath+StarBats nEntries = 2; for( int i = 0; i < nEntries; ++i ) { const RecodeTable& r = aStarSymbolRecodeTable[i]; if( aName.equalsAscii( r.pOrgName ) ) - { pCvt = &r.aCvt; break; } + { + pCvt = &r.aCvt; + break; + } } } else { - // TODO: FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS - if( aName == "starsymbol" ) pCvt = &aImplStarSymbolCvt; - else if( aName == "opensymbol" ) pCvt = &aImplStarSymbolCvt; + // TODO: FontToSubsFontFlags::ONLYOLDSOSYMBOLFONTS + if( aName == "starsymbol" ) + pCvt = &aImplStarSymbolCvt; + else if( aName == "opensymbol" ) + pCvt = &aImplStarSymbolCvt; } return (FontToSubsFontConverter)pCvt; |