diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-05-29 12:00:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-05-29 14:21:47 +0200 |
| commit | d4992bb36efb15da91a70e86e68a80f13b97e947 (patch) | |
| tree | e17ad8f8c013fef98d63473fed58eea4d5f5e830 /vcl/unx/generic | |
| parent | 0611e0643101c9282934de872249b438bd1a7f53 (diff) | |
Change SFErrCodes to scoped enum
Change-Id: Ib2f267397e419e8164bb2d732f7cbcca7acad1a6
Reviewed-on: https://gerrit.libreoffice.org/54996
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/print/glyphset.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 390158e48cf8..460a07c3c145 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -562,7 +562,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const OString aFile = getFontFile( pFont ); TrueTypeFont* pTTFont = nullptr; - if( OpenTTFontFile( aFile.getStr(), pFont->m_nCollectionEntry, &pTTFont ) == SF_OK ) + if( OpenTTFontFile( aFile.getStr(), pFont->m_nCollectionEntry, &pTTFont ) == SFErrCodes::Ok ) { TTGlobalFontInfo aInfo; GetTTGlobalFontInfo( pTTFont, & aInfo ); @@ -1018,7 +1018,7 @@ bool PrintFontManager::createFontSubset( const OString aFromFile = getFontFile( pFont ); TrueTypeFont* pTTFont = nullptr; // TODO: rename to SfntFont - if( OpenTTFontFile( aFromFile.getStr(), pFont->m_nCollectionEntry, &pTTFont ) != SF_OK ) + if( OpenTTFontFile( aFromFile.getStr(), pFont->m_nCollectionEntry, &pTTFont ) != SFErrCodes::Ok ) return false; // prepare system name for write access for subset file target @@ -1097,7 +1097,7 @@ bool PrintFontManager::createFontSubset( return false; } - bool bSuccess = ( SF_OK == CreateTTFromTTGlyphs( pTTFont, + bool bSuccess = ( SFErrCodes::Ok == CreateTTFromTTGlyphs( pTTFont, aToFile.getStr(), pGID, pEnc, @@ -1117,7 +1117,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, return; TrueTypeFont* pTTFont = nullptr; OString aFromFile = getFontFile( pFont ); - if( OpenTTFontFile( aFromFile.getStr(), pFont->m_nCollectionEntry, &pTTFont ) != SF_OK ) + if( OpenTTFontFile( aFromFile.getStr(), pFont->m_nCollectionEntry, &pTTFont ) != SFErrCodes::Ok ) return; int nGlyphs = GetTTGlyphCount(pTTFont); if (nGlyphs > 0) diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx index 9dacabb7dfb0..f688cb252dc1 100644 --- a/vcl/unx/generic/print/glyphset.cxx +++ b/vcl/unx/generic/print/glyphset.cxx @@ -249,8 +249,8 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 TrueTypeFont *pTTFont; OString aTTFileName (rGfx.GetFontMgr().getFontFileSysPath(mnFontID)); int nFace = rGfx.GetFontMgr().getFontFaceNumber(mnFontID); - sal_Int32 nSuccess = OpenTTFontFile(aTTFileName.getStr(), nFace, &pTTFont); - if (nSuccess != SF_OK) + SFErrCodes nSuccess = OpenTTFontFile(aTTFileName.getStr(), nFace, &pTTFont); + if (nSuccess != SFErrCodes::Ok) return; utl::TempFile aTmpFile; |