From 49329d19eff5b5beffdeaa54242c9534f5b470c4 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 17 Jan 2016 13:26:25 +1100 Subject: vcl: rename Font::GetName to Font::GetFamilyName Reviewed-on: https://gerrit.libreoffice.org/21529 Tested-by: Jenkins Reviewed-by: Chris Sherlock (cherry picked from commit 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e) Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f --- vcl/source/window/window.cxx | 2 +- vcl/source/window/window2.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/source/window') diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 2c4164eae76a..293d735ed4c4 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1889,7 +1889,7 @@ void Window::ImplNewInputContext() SalInputContext aNewContext; const vcl::Font& rFont = rInputContext.GetFont(); - const OUString& rFontName = rFont.GetName(); + const OUString& rFontName = rFont.GetFamilyName(); ImplFontEntry* pFontEntry = nullptr; aNewContext.mpFont = nullptr; if (!rFontName.isEmpty()) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index d39810a8f44a..45368093be5f 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -483,7 +483,7 @@ void Window::SetZoomedPointFont(vcl::RenderContext& rRenderContext, const vcl::F else nType = DefaultFontType::UI_SANS; vcl::Font aTempFont = OutputDevice::GetDefaultFont(nType, rRenderContext.GetSettings().GetLanguageTag().getLanguageType(), GetDefaultFontFlags::NONE); - aFont.SetName(aTempFont.GetName()); + aFont.SetName(aTempFont.GetFamilyName()); SetPointFont(rRenderContext, aFont); } } -- cgit v1.2.3