summaryrefslogtreecommitdiff
path: root/vcl/source/outdev/font.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/outdev/font.cxx')
-rw-r--r--vcl/source/outdev/font.cxx50
1 files changed, 25 insertions, 25 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 22567deaf993..3686d71ed76c 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -103,7 +103,7 @@ int OutputDevice::GetDevFontCount() const
bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const
{
PhysicalFontFamily* pFound = mpFontCollection->FindFontFamily( rFontName );
- return (pFound != NULL);
+ return (pFound != nullptr);
}
int OutputDevice::GetDevFontSizeCount( const vcl::Font& rFont ) const
@@ -494,7 +494,7 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists )
if ( mpFontEntry )
{
mpFontCache->Release( mpFontEntry );
- mpFontEntry = NULL;
+ mpFontEntry = nullptr;
}
mbInitFont = true;
@@ -505,12 +505,12 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists )
if ( mpGetDevFontList )
{
delete mpGetDevFontList;
- mpGetDevFontList = NULL;
+ mpGetDevFontList = nullptr;
}
if ( mpGetDevSizeList )
{
delete mpGetDevSizeList;
- mpGetDevSizeList = NULL;
+ mpGetDevSizeList = nullptr;
}
// release all physically selected fonts on this device
@@ -539,8 +539,8 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists )
delete mpFontCollection;
if( mpFontCache && mpFontCache != pSVData->maGDIData.mpScreenFontCache )
delete mpFontCache;
- mpFontCollection = 0;
- mpFontCache = 0;
+ mpFontCollection = nullptr;
+ mpFontCache = nullptr;
}
}
}
@@ -985,14 +985,14 @@ ImplFontEntry::ImplFontEntry( const FontSelectPattern& rFontSelData )
: m_pFontCache(nullptr)
, maFontSelData( rFontSelData )
, maMetric( rFontSelData )
- , mpConversion( NULL )
+ , mpConversion( nullptr )
, mnLineHeight( 0 )
, mnRefCount( 1 )
, mnSetFontFlags( 0 )
, mnOwnOrientation( 0 )
, mnOrientation( 0 )
, mbInit( false )
- , mpUnicodeFallbackList( NULL )
+ , mpUnicodeFallbackList( nullptr )
{
maFontSelData.mpFontEntry = this;
}
@@ -1076,8 +1076,8 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const vcl::Font& rFont
FontSelectPattern::FontSelectPattern( const vcl::Font& rFont,
const OUString& rSearchName, const Size& rSize, float fExactHeight)
: FontSelectPatternAttributes(rFont, rSearchName, rSize, fExactHeight)
- , mpFontData( NULL )
- , mpFontEntry( NULL )
+ , mpFontData( nullptr )
+ , mpFontEntry( nullptr )
{
}
@@ -1243,7 +1243,7 @@ bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const Fo
}
ImplFontCache::ImplFontCache()
-: mpFirstEntry( NULL ),
+: mpFirstEntry( nullptr ),
mnRef0Count( 0 )
{}
@@ -1272,8 +1272,8 @@ ImplFontEntry* ImplFontCache::GetFontEntry( PhysicalFontCollection* pFontList,
{
// check if a directly matching logical font instance is already cached,
// the most recently used font usually has a hit rate of >50%
- ImplFontEntry *pEntry = NULL;
- PhysicalFontFamily* pFontFamily = NULL;
+ ImplFontEntry *pEntry = nullptr;
+ PhysicalFontFamily* pFontFamily = nullptr;
IFSD_Equal aIFSD_Equal;
if( mpFirstEntry && aIFSD_Equal( aFontSelData, mpFirstEntry->maFontSelData ) )
pEntry = mpFirstEntry;
@@ -1288,7 +1288,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( PhysicalFontCollection* pFontList,
{
// find the best matching logical font family and update font selector accordingly
pFontFamily = pFontList->ImplFindByFont( aFontSelData );
- DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
+ DBG_ASSERT( (pFontFamily != nullptr), "ImplFontCache::Get() No logical font found!" );
if( pFontFamily )
aFontSelData.maSearchName = pFontFamily->GetSearchName();
@@ -1301,7 +1301,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( PhysicalFontCollection* pFontList,
}
}
- PhysicalFontFace* pFontData = NULL;
+ PhysicalFontFace* pFontData = nullptr;
if (!pEntry && pFontFamily)// no cache hit => find the best matching physical font face
{
@@ -1372,7 +1372,7 @@ ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( PhysicalFontCollection* pFon
// e.g. PsPrint Arial->Helvetica for udiaeresis when Helvetica doesn't support it
if( nFallbackLevel >= 1)
{
- PhysicalFontFamily* pFallbackData = NULL;
+ PhysicalFontFamily* pFallbackData = nullptr;
//fdo#33898 If someone has EUDC installed then they really want that to
//be used as the first-choice glyph fallback seeing as it's filled with
@@ -1388,7 +1388,7 @@ ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( PhysicalFontCollection* pFon
pFallbackData = pFontCollection->GetGlyphFallbackFont(rFontSelData, rMissingCodes, nFallbackLevel-1);
// escape when there are no font candidates
if( !pFallbackData )
- return NULL;
+ return nullptr;
// override the font name
rFontSelData.SetFamilyName( pFallbackData->GetFamilyName() );
// clear the cached normalized name
@@ -1435,7 +1435,7 @@ void ImplFontCache::Release(ImplFontEntry* pEntry)
assert(mnRef0Count>=0 && "ImplFontCache::Release() - refcount0 underflow");
if( mpFirstEntry == pFontEntry )
- mpFirstEntry = NULL;
+ mpFirstEntry = nullptr;
}
assert(mnRef0Count==0 && "ImplFontCache::Release() - refcount0 mismatch");
@@ -1473,7 +1473,7 @@ void ImplFontCache::Invalidate()
}
// #112304# make sure the font cache is really clean
- mpFirstEntry = NULL;
+ mpFirstEntry = nullptr;
maFontInstanceList.clear();
assert(mnRef0Count==0 && "ImplFontCache::Invalidate() - mnRef0Count non-zero");
@@ -1990,7 +1990,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout )
Color aOldFillColor = GetFillColor();
bool bOldMap = mbMap;
GDIMetaFile* pOldMetaFile = mpMetaFile;
- mpMetaFile = NULL;
+ mpMetaFile = nullptr;
EnableMapMode( false );
FontEmphasisMark nEmphasisMark = ImplGetEmphasisMarkStyle( maFont );
@@ -2084,13 +2084,13 @@ SalLayout* OutputDevice::getFallbackFont(ImplFontEntry &rFallbackFont,
SalLayout* pFallback = mpGraphics->GetTextLayout( rLayoutArgs, nFallbackLevel );
if (!pFallback)
- return NULL;
+ return nullptr;
if (!pFallback->LayoutText(rLayoutArgs))
{
// there is no need for a font that couldn't resolve anything
pFallback->Release();
- return NULL;
+ return nullptr;
}
pFallback->AdjustLayout( rLayoutArgs );
@@ -2107,11 +2107,11 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
{
SAL_WARN ("vcl.gdi", "No font entry set in OutputDevice");
assert(mpFontEntry);
- return NULL;
+ return nullptr;
}
// prepare multi level glyph fallback
- MultiSalLayout* pMultiSalLayout = NULL;
+ MultiSalLayout* pMultiSalLayout = nullptr;
ImplLayoutRuns aLayoutRuns = rLayoutArgs.maRuns;
rLayoutArgs.PrepareFallback();
rLayoutArgs.mnFlags |= SalLayoutFlags::ForFallback;
@@ -2280,7 +2280,7 @@ sal_Int32 OutputDevice::HasGlyphs( const vcl::Font& rTempFont, const OUString& r
if( ! pFontCharMap->HasChar( rStr[i] ) )
return nIndex;
- pFontCharMap = 0;
+ pFontCharMap = nullptr;
return -1;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-20 05:47:23 +0000