diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-18 10:40:22 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-18 05:24:46 +0000 |
| commit | cb20f46895f0ec759f2bea95e499c6902deb60ca (patch) | |
| tree | e7790f7df9436a29ba8309d0ad99d518fb34d9ad /vcl/source/outdev | |
| parent | 3b14cdf7386f41395d1b089c3b9dde7d4429cf38 (diff) | |
vcl: change Font::SetName() to Font::SetFamilyName()
Change-Id: I9b7bd1ec25955981ebcb9085579cbb9fbaa802d5
Reviewed-on: https://gerrit.libreoffice.org/21560
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/source/outdev')
| -rw-r--r-- | vcl/source/outdev/font.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 99d2109a2b4f..8fa55cae7852 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -74,7 +74,7 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const if( nDevFontIndex < nCount ) { const PhysicalFontFace& rData = *mpDeviceFontList->Get( nDevFontIndex ); - aFontMetric.SetName( rData.GetFamilyName() ); + aFontMetric.SetFamilyName( rData.GetFamilyName() ); aFontMetric.SetStyleName( rData.GetStyleName() ); aFontMetric.SetCharSet( rData.GetCharSet() ); aFontMetric.SetFamily( rData.GetFamilyType() ); @@ -195,7 +195,7 @@ FontMetric OutputDevice::GetFontMetric() const aMetric.Font::operator=( maFont ); // set aMetric with info from font - aMetric.SetName( maFont.GetFamilyName() ); + aMetric.SetFamilyName( maFont.GetFamilyName() ); aMetric.SetStyleName( xFontMetric->GetStyleName() ); aMetric.SetSize( PixelToLogic( Size( xFontMetric->GetWidth(), xFontMetric->GetAscent() + xFontMetric->GetDescent() - xFontMetric->GetInternalLeading() ) ) ); aMetric.SetCharSet( xFontMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); @@ -879,7 +879,7 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan } } while ( nIndex != -1 ); - aFont.SetName( aName ); + aFont.SetFamilyName( aName ); } // No Name, than set all names @@ -891,13 +891,13 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan { SAL_WARN ("vcl.gdi", "No default window has been set for the application - we really shouldn't be able to get here"); sal_Int32 nIndex = 0; - aFont.SetName( aSearch.getToken( 0, ';', nIndex ) ); + aFont.SetFamilyName( aSearch.getToken( 0, ';', nIndex ) ); } else { pOutDev->ImplInitFontList(); - aFont.SetName( aSearch ); + aFont.SetFamilyName( aSearch ); // convert to pixel height Size aSize = pOutDev->ImplLogicToDevicePixel( aFont.GetSize() ); @@ -920,15 +920,15 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan if (pFontInstance) { if( pFontInstance->maFontSelData.mpFontData ) - aFont.SetName( pFontInstance->maFontSelData.mpFontData->GetFamilyName() ); + aFont.SetFamilyName( pFontInstance->maFontSelData.mpFontData->GetFamilyName() ); else - aFont.SetName( pFontInstance->maFontSelData.maTargetName ); + aFont.SetFamilyName( pFontInstance->maFontSelData.maTargetName ); pOutDev->mpFontCache->Release(pFontInstance); } } } else - aFont.SetName( aSearch ); + aFont.SetFamilyName( aSearch ); } } |