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/win | |
| 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/win')
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/window/salframe.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index b95e9f57f56d..c8b63d2fd96c 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -868,7 +868,7 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) OUString aFontName( reinterpret_cast<const sal_Unicode*>(rLogFont.lfFaceName) ); if (!aFontName.isEmpty()) { - rFont.SetName( aFontName ); + rFont.SetFamilyName( aFontName ); rFont.SetCharSet( ImplCharSetToSal( rLogFont.lfCharSet ) ); rFont.SetFamily( ImplFamilyToSal( rLogFont.lfPitchAndFamily ) ); rFont.SetPitch( ImplLogPitchToSal( rLogFont.lfPitchAndFamily ) ); diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index c24fce107aa1..8230ffb916e9 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -2792,7 +2792,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) if ( aFirstName.equalsIgnoreAsciiCase( "MS Sans Serif" ) ) { aFontName = "Arial;" + aFontName; - aAppFont.SetName( aFontName ); + aAppFont.SetFamilyName( aFontName ); } } aStyleSettings.SetAppFont( aAppFont ); |