summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/font/PhysicalFontCollection.cxx8
-rw-r--r--vcl/source/font/PhysicalFontFamily.cxx2
-rw-r--r--vcl/source/gdi/embeddedfontshelper.cxx2
-rw-r--r--vcl/source/gdi/print.cxx24
-rw-r--r--vcl/source/gdi/virdev.cxx6
-rw-r--r--vcl/source/outdev/font.cxx14
-rw-r--r--vcl/source/outdev/outdev.cxx6
-rw-r--r--vcl/source/outdev/outdevstate.cxx6
8 files changed, 34 insertions, 34 deletions
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 033499ed128d..df863b6bc273 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -953,18 +953,18 @@ PhysicalFontCollection* PhysicalFontCollection::Clone( bool bScalable, bool bEmb
return pClonedCollection;
}
-ImplGetDevFontList* PhysicalFontCollection::GetDevFontList() const
+ImplDeviceFontList* PhysicalFontCollection::GetDevFontList() const
{
- ImplGetDevFontList* pGetDevFontList = new ImplGetDevFontList;
+ ImplDeviceFontList* pDeviceFontList = new ImplDeviceFontList;
PhysicalFontFamilies::const_iterator it = maPhysicalFontFamilies.begin();
for(; it != maPhysicalFontFamilies.end(); ++it )
{
const PhysicalFontFamily* pFontFamily = (*it).second;
- pFontFamily->UpdateDevFontList( *pGetDevFontList );
+ pFontFamily->UpdateDevFontList( *pDeviceFontList );
}
- return pGetDevFontList;
+ return pDeviceFontList;
}
ImplGetDevSizeList* PhysicalFontCollection::GetDevSizeList( const OUString& rFontName ) const
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index 1496091d08f7..83f2ab07e99e 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -247,7 +247,7 @@ PhysicalFontFace* PhysicalFontFamily::FindBestFontFace( const FontSelectPattern&
// update device font list with unique font faces, with uniqueness
// meaning different font attributes, but not different fonts sizes
-void PhysicalFontFamily::UpdateDevFontList( ImplGetDevFontList& rDevFontList ) const
+void PhysicalFontFamily::UpdateDevFontList( ImplDeviceFontList& rDevFontList ) const
{
PhysicalFontFace* pPrevFace = nullptr;
for( PhysicalFontFace* pFace = mpFirst; pFace; pFace = pFace->GetNextFace() )
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index fa7fb59eee5c..54bd9e21aef5 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -230,7 +230,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString& familyName, FontFamil
SalGraphics* graphics = Application::GetDefaultDevice()->GetGraphics();
PhysicalFontCollection fonts;
graphics->GetDevFontList( &fonts );
- std::unique_ptr< ImplGetDevFontList > fontInfo( fonts.GetDevFontList());
+ std::unique_ptr< ImplDeviceFontList > fontInfo( fonts.GetDevFontList());
PhysicalFontFace* selected = nullptr;
for( int i = 0;
i < fontInfo->Count();
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index ebe19e95b327..f4e106c474b1 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -636,10 +636,10 @@ void Printer::ImplReleaseFonts()
mpFontEntry = nullptr;
}
- if ( mpGetDevFontList )
+ if ( mpDeviceFontList )
{
- delete mpGetDevFontList;
- mpGetDevFontList = nullptr;
+ delete mpDeviceFontList;
+ mpDeviceFontList = nullptr;
}
if ( mpGetDevSizeList )
@@ -1013,10 +1013,10 @@ void Printer::dispose()
mpFontCache->Release( mpFontEntry );
mpFontEntry = nullptr;
}
- if ( mpGetDevFontList )
+ if ( mpDeviceFontList )
{
- delete mpGetDevFontList;
- mpGetDevFontList = nullptr;
+ delete mpDeviceFontList;
+ mpDeviceFontList = nullptr;
}
if ( mpGetDevSizeList )
{
@@ -1167,10 +1167,10 @@ bool Printer::SetPrinterProps( const Printer* pPrinter )
mpFontCache->Release( mpFontEntry );
mpFontEntry = nullptr;
}
- if ( mpGetDevFontList )
+ if ( mpDeviceFontList )
{
- delete mpGetDevFontList;
- mpGetDevFontList = nullptr;
+ delete mpDeviceFontList;
+ mpDeviceFontList = nullptr;
}
if ( mpGetDevSizeList )
{
@@ -1210,10 +1210,10 @@ bool Printer::SetPrinterProps( const Printer* pPrinter )
mpFontCache->Release( mpFontEntry );
mpFontEntry = nullptr;
}
- if ( mpGetDevFontList )
+ if ( mpDeviceFontList )
{
- delete mpGetDevFontList;
- mpGetDevFontList = nullptr;
+ delete mpDeviceFontList;
+ mpDeviceFontList = nullptr;
}
if ( mpGetDevSizeList )
{
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index af9bbbdddc83..f97b810ce903 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -514,10 +514,10 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
mpFontCache->Release( mpFontEntry );
mpFontEntry = nullptr;
}
- if ( mpGetDevFontList )
+ if ( mpDeviceFontList )
{
- delete mpGetDevFontList;
- mpGetDevFontList = nullptr;
+ delete mpDeviceFontList;
+ mpDeviceFontList = nullptr;
}
if ( mpGetDevSizeList )
{
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 )
generated by cgit (git 2.34.1) at 2025-01-28 19:31:47 +0000