summaryrefslogtreecommitdiff
path: root/vcl/source/outdev
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/outdev')
-rw-r--r--vcl/source/outdev/font.cxx14
-rw-r--r--vcl/source/outdev/outdev.cxx6
-rw-r--r--vcl/source/outdev/outdevstate.cxx6
3 files changed, 13 insertions, 13 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index a6bed226ae1c..b2ac6f281595 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -70,7 +70,7 @@ vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const
int nCount = GetDevFontCount();
if( nDevFontIndex < nCount )
{
- const PhysicalFontFace& rData = *mpGetDevFontList->Get( nDevFontIndex );
+ const PhysicalFontFace& rData = *mpDeviceFontList->Get( nDevFontIndex );
aFontInfo.SetName( rData.GetFamilyName() );
aFontInfo.SetStyleName( rData.GetStyleName() );
aFontInfo.SetCharSet( rData.IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
@@ -90,14 +90,14 @@ vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const
int OutputDevice::GetDevFontCount() const
{
- if( !mpGetDevFontList )
+ if( !mpDeviceFontList )
{
if (!mpFontCollection)
return 0;
- mpGetDevFontList = mpFontCollection->GetDevFontList();
+ mpDeviceFontList = mpFontCollection->GetDevFontList();
}
- return mpGetDevFontList->Count();
+ return mpDeviceFontList->Count();
}
bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const
@@ -503,10 +503,10 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists )
if ( bNewFontLists )
{
- if ( mpGetDevFontList )
+ if ( mpDeviceFontList )
{
- delete mpGetDevFontList;
- mpGetDevFontList = nullptr;
+ delete mpDeviceFontList;
+ mpDeviceFontList = nullptr;
}
if ( mpGetDevSizeList )
{
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 5d7f98de73cf..14b6321f20f3 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -96,7 +96,7 @@ OutputDevice::OutputDevice() :
mpFontEntry = nullptr;
mpFontCache = nullptr;
mpFontCollection = nullptr;
- mpGetDevFontList = nullptr;
+ mpDeviceFontList = nullptr;
mpGetDevSizeList = nullptr;
mpOutDevStateStack = new OutDevStateStack;
mpPDFWriter = nullptr;
@@ -239,8 +239,8 @@ void OutputDevice::dispose()
// remove cached results of GetDevFontList/GetDevSizeList
// TODO: use smart pointers for them
- delete mpGetDevFontList;
- mpGetDevFontList = nullptr;
+ delete mpDeviceFontList;
+ mpDeviceFontList = nullptr;
delete mpGetDevSizeList;
mpGetDevSizeList = nullptr;
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index aa3de62f881d..8175ea64f905 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -639,10 +639,10 @@ void OutputDevice::ImplReleaseFonts()
mpFontEntry = nullptr;
}
- if ( mpGetDevFontList )
+ if ( mpDeviceFontList )
{
- delete mpGetDevFontList;
- mpGetDevFontList = nullptr;
+ delete mpDeviceFontList;
+ mpDeviceFontList = nullptr;
}
if ( mpGetDevSizeList )