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 /include | |
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 'include')
-rw-r--r-- | include/vcl/font.hxx | 2 | ||||
-rw-r--r-- | include/vcl/metric.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
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<charT, traits> & operator <<( std::basic_ostream<charT, traits> & stream, const FontMetric& rMetric ) { stream << "{" - << "name=" << "\"" << rMetric.GetName() << "\"" + << "name=" << "\"" << rMetric.GetFamilyName() << "\"" << ",size=(" << rMetric.GetSize().Width() << "," << rMetric.GetSize().Height() << ")" << ",ascent=" << rMetric.GetAscent() << ",descent=" << rMetric.GetDescent() |