diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-17 13:26:25 +1100 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:56 -0400 |
| commit | 49329d19eff5b5beffdeaa54242c9534f5b470c4 (patch) | |
| tree | 85517ead7d4e926c17f9e52cda01475c3c93eaeb /vcl/source/outdev | |
| parent | 745d356d6b5b6b9308f35e89713288f17dd32503 (diff) | |
vcl: rename Font::GetName to Font::GetFamilyName
Reviewed-on: https://gerrit.libreoffice.org/21529
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e)
Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f
Diffstat (limited to 'vcl/source/outdev')
| -rw-r--r-- | vcl/source/outdev/font.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index e7f866d4c475..a7c8b3a41bf2 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -121,7 +121,7 @@ int OutputDevice::GetDevFontSizeCount( const vcl::Font& rFont ) const delete mpGetDevSizeList; ImplInitFontList(); - mpGetDevSizeList = mpFontCollection->GetDevSizeList( rFont.GetName() ); + mpGetDevSizeList = mpFontCollection->GetDevSizeList( rFont.GetFamilyName() ); return mpGetDevSizeList->Count(); } @@ -204,7 +204,7 @@ FontMetric OutputDevice::GetFontMetric() const aMetric.Font::operator=( maFont ); // set aMetric with info from font - aMetric.SetName( maFont.GetName() ); + aMetric.SetName( maFont.GetFamilyName() ); aMetric.SetStyleName( pMetric->GetStyleName() ); aMetric.SetSize( PixelToLogic( Size( pMetric->mnWidth, pMetric->mnAscent+pMetric->mnDescent-pMetric->mnIntLeading ) ) ); aMetric.SetCharSet( pMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); @@ -898,7 +898,7 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan } // No Name, than set all names - if ( aFont.GetName().isEmpty() ) + if ( aFont.GetFamilyName().isEmpty() ) { if ( nFlags & GetDefaultFontFlags::OnlyOne ) { @@ -1268,7 +1268,7 @@ ImplFontCache::~ImplFontCache() ImplFontEntry* ImplFontCache::GetFontEntry( PhysicalFontCollection* pFontList, const vcl::Font& rFont, const Size& rSize, float fExactHeight ) { - OUString aSearchName = rFont.GetName(); + OUString aSearchName = rFont.GetFamilyName(); // initialize internal font request object FontSelectPattern aFontSelData( rFont, aSearchName, rSize, fExactHeight ); |