diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-16 21:01:00 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-16 16:11:28 +0000 |
| commit | 2b297116cb6bb1061c43e5714e2609c8ee9f57d2 (patch) | |
| tree | 9622cff5a49a891f64899e34c48b53e8d462e96e /vcl/source/font/font.cxx | |
| parent | 7d93bb8fcb406773d2dc68b25ab7cee6e114d482 (diff) | |
vcl: rename Font::GetName to Font::GetFamilyName
Change-Id: I83927e0992dfe0a2a79d139818a9f45d3761aae5
Reviewed-on: https://gerrit.libreoffice.org/21509
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/source/font/font.cxx')
| -rw-r--r-- | vcl/source/font/font.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index dfb219a2c893..8c69ea63ee60 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -409,9 +409,9 @@ bool Font::operator==( const vcl::Font& rFont ) const void Font::Merge( const vcl::Font& rFont ) { - if ( !rFont.GetName().isEmpty() ) + if ( !rFont.GetFamilyName().isEmpty() ) { - SetName( rFont.GetName() ); + SetName( rFont.GetFamilyName() ); SetStyleName( rFont.GetStyleName() ); SetCharSet( GetCharSet() ); SetLanguageTag( rFont.GetLanguageTag() ); @@ -778,7 +778,7 @@ bool Font::IsTransparent() const { return mpImplFont->mbTransparent; } FontAlign Font::GetAlign() const { return mpImplFont->meAlign; } -const OUString& Font::GetName() const { return mpImplFont->GetFamilyName(); } +const OUString& Font::GetFamilyName() const { return mpImplFont->GetFamilyName(); } const OUString& Font::GetStyleName() const { return mpImplFont->maStyleName; } |