From 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e 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 Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f Reviewed-on: https://gerrit.libreoffice.org/21529 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- include/vcl/font.hxx | 2 +- include/vcl/metric.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index c8a2c2df9037..e223ba3c66ca 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -67,7 +67,7 @@ public: FontAlign GetAlign() const; void SetName( const OUString& rFamilyName ); - const OUString& GetName() const; + const OUString& GetFamilyName() const; void SetStyleName( const OUString& rStyleName ); const OUString& GetStyleName() const; void SetSize( const Size& ); diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index e37b91ffac75..d3dfa9c2f167 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -81,7 +81,7 @@ inline std::basic_ostream & operator <<( std::basic_ostream & stream, const FontMetric& rMetric ) { stream << "{" - << "name=" << "\"" << rMetric.GetName() << "\"" + << "name=" << "\"" << rMetric.GetFamilyName() << "\"" << ",size=(" << rMetric.GetSize().Width() << "," << rMetric.GetSize().Height() << ")" << ",ascent=" << rMetric.GetAscent() << ",descent=" << rMetric.GetDescent() -- cgit