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/win | |
| 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/win')
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index 2d6512154e2a..1313778ccebb 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -1613,7 +1613,7 @@ public: ~ScopedTrueTypeFont(); - int open(void const * pBuffer, sal_uInt32 nLen, sal_uInt32 nFaceNum); + SFErrCodes open(void const * pBuffer, sal_uInt32 nLen, sal_uInt32 nFaceNum); TrueTypeFont * get() const { return m_pFont; } @@ -1627,7 +1627,7 @@ ScopedTrueTypeFont::~ScopedTrueTypeFont() CloseTTFont(m_pFont); } -int ScopedTrueTypeFont::open(void const * pBuffer, sal_uInt32 nLen, +SFErrCodes ScopedTrueTypeFont::open(void const * pBuffer, sal_uInt32 nLen, sal_uInt32 nFaceNum) { OSL_ENSURE(m_pFont == nullptr, "already open"); @@ -1698,8 +1698,8 @@ bool WinSalGraphics::CreateFontSubset( const OUString& rToFile, nFaceNum = ~0U; // indicate "TTC font extracts only" ScopedTrueTypeFont aSftTTF; - int nRC = aSftTTF.open( xRawFontData.get(), xRawFontData.size(), nFaceNum ); - if( nRC != SF_OK ) + SFErrCodes nRC = aSftTTF.open( xRawFontData.get(), xRawFontData.size(), nFaceNum ); + if( nRC != SFErrCodes::Ok ) return FALSE; TTGlobalFontInfo aTTInfo; @@ -1757,7 +1757,7 @@ bool WinSalGraphics::CreateFontSubset( const OUString& rToFile, // write subset into destination file nRC = ::CreateTTFromTTGlyphs( aSftTTF.get(), aToFile.getStr(), aShortIDs, aTempEncs, nGlyphCount ); - return (nRC == SF_OK); + return (nRC == SFErrCodes::Ok); } const void* WinSalGraphics::GetEmbedFontData(const PhysicalFontFace* pFont, long* pDataLen) @@ -1811,8 +1811,8 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, nFaceNum = ~0U; // indicate "TTC font extracts only" ScopedTrueTypeFont aSftTTF; - int nRC = aSftTTF.open( xRawFontData.get(), xRawFontData.size(), nFaceNum ); - if( nRC != SF_OK ) + SFErrCodes nRC = aSftTTF.open( xRawFontData.get(), xRawFontData.size(), nFaceNum ); + if( nRC != SFErrCodes::Ok ) return; int nGlyphs = GetTTGlyphCount( aSftTTF.get() ); |