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/font/font.cxx | |
| 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/font/font.cxx')
| -rw-r--r-- | vcl/source/font/font.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index 8c69ea63ee60..8cca361e5faf 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -137,7 +137,7 @@ void Font::SetAlign( FontAlign eAlign ) } } -void Font::SetName( const OUString& rFamilyName ) +void Font::SetFamilyName( const OUString& rFamilyName ) { MakeUnique(); mpImplFont->SetFamilyName( rFamilyName ); @@ -411,7 +411,7 @@ void Font::Merge( const vcl::Font& rFont ) { if ( !rFont.GetFamilyName().isEmpty() ) { - SetName( rFont.GetFamilyName() ); + SetFamilyName( rFont.GetFamilyName() ); SetStyleName( rFont.GetStyleName() ); SetCharSet( GetCharSet() ); SetLanguageTag( rFont.GetLanguageTag() ); @@ -573,9 +573,9 @@ namespace GetTTGlobalFontInfo( pTTF, &aInfo ); // most importantly: the family name if( aInfo.ufamily ) - o_rResult.SetName( aInfo.ufamily ); + o_rResult.SetFamilyName( aInfo.ufamily ); else if( aInfo.family ) - o_rResult.SetName( OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) ); + o_rResult.SetFamilyName( OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) ); // set weight if( aInfo.weight ) { @@ -690,7 +690,7 @@ namespace pClose++; if( pClose - pOpen > 1 ) { - o_rResult.SetName( OStringToOUString( OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) ); + o_rResult.SetFamilyName( OStringToOUString( OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) ); } } |