From 60e78fbb806bb45e635ba1de45ceffe187938ac0 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 16 Sep 2014 10:09:58 +0200
Subject: fdo#82577: Handle Font

Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
---
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vcl/unx/gtk/gdi')

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index de64314bd09d..dd9dc6e0797e 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3954,7 +3954,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     else
         nPointHeight = nPangoHeight/PANGO_SCALE;
 
-    Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
+    vcl::Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
     if( aInfo.m_eWeight != WEIGHT_DONTKNOW )
         aFont.SetWeight( aInfo.m_eWeight );
     if( aInfo.m_eWidth != WIDTH_DONTKNOW )
-- 
cgit v1.2.3