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
---
 basctl/source/basicide/layout.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'basctl/source/basicide/layout.cxx')

diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 59657216f7c0..02fb50f5c373 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -44,7 +44,7 @@ Layout::Layout (Window* pParent) :
 {
     SetBackground(GetSettings().GetStyleSettings().GetWindowColor());
 
-    Font aFont = GetFont();
+    vcl::Font aFont = GetFont();
     Size aSz = aFont.GetSize();
     aSz.Height() *= 1.5;
     aFont.SetSize(aSz);
@@ -145,7 +145,7 @@ void Layout::DataChanged (DataChangedEvent const& rDCEvt)
         aColor = GetSettings().GetStyleSettings().GetWindowTextColor();
         if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetWindowTextColor())
         {
-            Font aFont(GetFont());
+            vcl::Font aFont(GetFont());
             aFont.SetColor(aColor);
             SetFont(aFont);
             bInvalidate = true;
-- 
cgit