diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/outdev/font.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 15 |
4 files changed, 12 insertions, 19 deletions
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index e38f5d29f9e0..5c24d2290937 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -104,7 +104,7 @@ CoreTextFontFace::CoreTextFontFace( const CoreTextFontFace& rSrc ) : PhysicalFontFace( rSrc ) , mnFontId( rSrc.mnFontId ) { - if( rSrc.mxCharMap.Is() ) + if( rSrc.mxCharMap.is() ) mxCharMap = rSrc.mxCharMap; } @@ -117,10 +117,6 @@ CoreTextFontFace::CoreTextFontFace( const FontAttributes& rDFA, sal_IntPtr nFont CoreTextFontFace::~CoreTextFontFace() { - if( mxCharMap.Is() ) - { - mxCharMap = nullptr; - } } sal_IntPtr CoreTextFontFace::GetFontId() const @@ -131,7 +127,7 @@ sal_IntPtr CoreTextFontFace::GetFontId() const const FontCharMapRef CoreTextFontFace::GetFontCharMap() const { // return the cached charmap - if( mxCharMap.Is() ) + if( mxCharMap.is() ) return mxCharMap; // set the default charmap @@ -800,7 +796,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV CoreTextFontFace rCTFontData(*pFontData, pFontData->GetFontId()); FontCharMapRef xFCMap = rCTFontData.GetFontCharMap(); - SAL_WARN_IF( !xFCMap.Is() || !xFCMap->GetCharCount(), "vcl", "no charmap" ); + SAL_WARN_IF( !xFCMap.is() || !xFCMap->GetCharCount(), "vcl", "no charmap" ); // get unicode<->glyph encoding // TODO? avoid sft mapping by using the xFCMap itself diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 572ac6739430..cea5665cc6ac 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -239,7 +239,7 @@ bool OutputDevice::GetFontCharMap( FontCharMapRef& rxFontCharMap ) const return false; FontCharMapRef xFontCharMap ( mpGraphics->GetFontCharMap() ); - if (!xFontCharMap.Is()) + if (!xFontCharMap.is()) { FontCharMapRef xDefaultMap( new FontCharMap() ); rxFontCharMap = xDefaultMap; diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 62956369587b..903f560e1a55 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -183,8 +183,6 @@ FreetypeFontInfo::FreetypeFontInfo( const FontAttributes& rDevFontAttributes, FreetypeFontInfo::~FreetypeFontInfo() { - if( mxFontCharMap.Is() ) - mxFontCharMap.Clear(); } FT_FaceRec_* FreetypeFontInfo::GetFaceFT() @@ -672,7 +670,7 @@ const FontCharMapRef FreetypeFont::GetFontCharMap() const const FontCharMapRef& FreetypeFontInfo::GetFontCharMap() { // check if the charmap is already cached - if( mxFontCharMap.Is() ) + if( mxFontCharMap.is() ) return mxFontCharMap; // get the charmap and cache it diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index d1aebb3e6df6..ad7cc5653880 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -165,7 +165,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars(PhysicalFontFace* pFace, OU { WinFontFace* pWinFont = static_cast< WinFontFace* >(pFace); FontCharMapRef xFontCharMap = pWinFont->GetFontCharMap(); - if( !xFontCharMap.Is() ) + if( !xFontCharMap.is() ) { // construct a Size structure as the parameter of constructor of class FontSelectPattern const Size aSize( pFace->GetWidth(), pFace->GetHeight() ); @@ -192,7 +192,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars(PhysicalFontFace* pFace, OU } // avoid fonts with unknown CMAP subtables for glyph fallback - if( !xFontCharMap.Is() || xFontCharMap->IsDefaultMap() ) + if( !xFontCharMap.is() || xFontCharMap->IsDefaultMap() ) return false; int nMatchCount = 0; @@ -646,8 +646,7 @@ WinFontFace::WinFontFace( const FontAttributes& rDFS, WinFontFace::~WinFontFace() { - if( mxUnicodeMap.Is() ) - mxUnicodeMap = nullptr; + mxUnicodeMap.clear(); if( mpHbFont ) hb_font_destroy( mpHbFont ); @@ -663,7 +662,7 @@ static inline DWORD CalcTag( const char p[5]) { return (p[0]+(p[1]<<8)+(p[2]<<16 void WinFontFace::UpdateFromHDC( HDC hDC ) const { // short circuit if already initialized - if( mxUnicodeMap.Is() ) + if( mxUnicodeMap.is() ) return; ReadCmapTable( hDC ); @@ -683,7 +682,7 @@ bool WinFontFace::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) void WinFontFace::ReadCmapTable( HDC hDC ) const { - if( mxUnicodeMap.Is() ) + if( mxUnicodeMap.is() ) return; bool bIsSymbolFont = (meWinCharSet == SYMBOL_CHARSET); @@ -702,7 +701,7 @@ void WinFontFace::ReadCmapTable( HDC hDC ) const } } - if( !mxUnicodeMap.Is() ) + if( !mxUnicodeMap.is() ) { mxUnicodeMap = FontCharMap::GetDefaultMap( bIsSymbolFont ); } @@ -1816,7 +1815,7 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, } const WinFontFace* pWinFont = static_cast<const WinFontFace*>(pFont); FontCharMapRef xFCMap = pWinFont->GetFontCharMap(); - SAL_WARN_IF( !xFCMap.Is() || !xFCMap->GetCharCount(), "vcl", "no map" ); + SAL_WARN_IF( !xFCMap.is() || !xFCMap->GetCharCount(), "vcl", "no map" ); int nCharCount = xFCMap->GetCharCount(); sal_uInt32 nChar = xFCMap->GetFirstChar(); |