diff options
| author | Jacek Fraczek <fraczek.jacek@gmail.com> | 2016-10-05 22:00:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-10 08:48:30 +0000 |
| commit | f004aa99514d385f3ee254bba735f5eaeb7d9ad8 (patch) | |
| tree | aacd5792f553b8e9cbf029cc7e0797ed0dd423fe /vcl/win | |
| parent | 728c7327bd97602a38723553ed044ea4c01d13b2 (diff) | |
tdf#89307: Removed SvRef::operator T*()
Conditional statements are using SvRef::Is() method.
Changed static_cast<T*>(svRef<T>) occurances to svRef.get().
Added operator == and != to SvRef.
SbxObject::Execute is using SbxVariableRef internally.
SbxObject::FindQualified is using SbxVariableRef internally.
Change-Id: I45b553e35d8fca9bf71163e6eefc60802a066395
Reviewed-on: https://gerrit.libreoffice.org/29621
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 ee3ea8342853..b76102176969 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -307,7 +307,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( PhysicalFontFace* pFace, c { WinFontFace* pWinFont = static_cast< WinFontFace* >(pFace); FontCharMapRef xFontCharMap = pWinFont->GetFontCharMap(); - if( !xFontCharMap ) + if( !xFontCharMap.Is() ) { // construct a Size structure as the parameter of constructor of class FontSelectPattern const Size aSize( pFace->GetWidth(), pFace->GetHeight() ); @@ -334,7 +334,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( PhysicalFontFace* pFace, c } // avoid fonts with unknown CMAP subtables for glyph fallback - if( !xFontCharMap || xFontCharMap->IsDefaultMap() ) + if( !xFontCharMap.Is() || xFontCharMap->IsDefaultMap() ) return false; int nMatchCount = 0; @@ -899,7 +899,7 @@ WinFontFace::WinFontFace( const FontAttributes& rDFS, WinFontFace::~WinFontFace() { - if( mxUnicodeMap ) + if( mxUnicodeMap.Is() ) mxUnicodeMap = 0; #if ENABLE_GRAPHITE if (mpGraphiteData) @@ -922,7 +922,7 @@ static inline DWORD CalcTag( const char p[4]) { return (p[0]+(p[1]<<8)+(p[2]<<16 void WinFontFace::UpdateFromHDC( HDC hDC ) const { // short circuit if already initialized - if( mxUnicodeMap != NULL ) + if( mxUnicodeMap.Is() ) return; ReadCmapTable( hDC ); @@ -1036,7 +1036,7 @@ void WinFontFace::ReadGsubTable( HDC hDC ) const void WinFontFace::ReadCmapTable( HDC hDC ) const { - if( mxUnicodeMap != NULL ) + if( mxUnicodeMap.Is() ) return; bool bIsSymbolFont = (meWinCharSet == SYMBOL_CHARSET); @@ -1055,7 +1055,7 @@ void WinFontFace::ReadCmapTable( HDC hDC ) const } } - if( !mxUnicodeMap ) + if( !mxUnicodeMap.Is() ) { mxUnicodeMap = FontCharMap::GetDefaultMap( bIsSymbolFont ); } @@ -2403,7 +2403,7 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, } const WinFontFace* pWinFont = static_cast<const WinFontFace*>(pFont); FontCharMapRef xFCMap = pWinFont->GetFontCharMap(); - SAL_WARN_IF( !xFCMap || !xFCMap->GetCharCount(), "vcl", "no map" ); + SAL_WARN_IF( !xFCMap.Is() || !xFCMap->GetCharCount(), "vcl", "no map" ); int nCharCount = xFCMap->GetCharCount(); sal_uInt32 nChar = xFCMap->GetFirstChar(); |