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 --- vcl/workben/svptest.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/workben') diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index d0e070a577de..2303f23c0d0b 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -256,7 +256,7 @@ void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) for (int i = 0; i < nFontSamples; ++i) { - vcl::FontInfo aFont = rRenderContext.GetDevFont((i * nFontCount) / nFontSamples); + FontMetric aFont = rRenderContext.GetDevFont((i * nFontCount) / nFontSamples); aFont.SetHeight(400 + (i % 7) * 100); aFont.SetOrientation(i * (3600 / nFontSamples)); rRenderContext.SetFont(aFont); -- cgit