From 8227b9955e4a06758f3e0a871e49731a0a607608 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Mon, 4 Jan 2016 01:16:47 +1100 Subject: vcl: Excise vcl::FontInfo class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This may sound crazy, but literally vcl::FontInfo serves no purpose that I can see. The inheritance chain is like this: ┌────────────────────────┐ │ │ │ vcl::Font │ │ │ └────────────────────────┘ ^ ╱ ╲ │ │ ┌────────────────────────┐ │ │ │ vcl::FontInfo │ │ │ └────────────────────────┘ ^ ╱ ╲ │ │ ┌────────────────────────┐ │ │ │ FontMetric │ │ │ └────────────────────────┘ vcl::FontInfo (which, incidentally, needs to be put into the vcl namespace due to collisions with poppler!) literally does nothing and is acting as a bridge between FontMetric and vcl::Font. Unlike a bridge though, this bridge doesn't actually *do* anything. So I'm removing it, which means one less class to deal with in the vcl fonts world. Change-Id: I32725669c9bca7fbb0846b6a062135464046e4f6 Reviewed-on: https://gerrit.libreoffice.org/21058 Reviewed-by: Chris Sherlock Tested-by: Chris Sherlock --- svtools/source/control/stdmenu.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svtools/source/control/stdmenu.cxx') diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index 4296dbb3b093..770dc57d6549 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -125,7 +125,7 @@ void FontSizeMenu::Highlight() { } -void FontSizeMenu::Fill( const vcl::FontInfo& rInfo, const FontList* pList ) +void FontSizeMenu::Fill( const FontMetric& rInfo, const FontList* pList ) { Clear(); -- cgit