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
---
 svtools/source/control/roadmap.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'svtools/source/control/roadmap.cxx')

diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 01960b8dfb81..cc90d4344ed4 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -175,7 +175,7 @@ namespace svt
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
         Color aTextColor = rStyleSettings.GetFieldTextColor();
-        Font aFont = GetFont( );
+        vcl::Font aFont = GetFont( );
         aFont.SetColor( aTextColor );
         aFont.SetWeight( WEIGHT_BOLD );
         aFont.SetUnderline( UNDERLINE_SINGLE );
@@ -667,7 +667,7 @@ namespace svt
             const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
             SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) );
             Color aTextColor = rStyleSettings.GetFieldTextColor();
-            Font aFont = GetFont();
+            vcl::Font aFont = GetFont();
             aFont.SetColor( aTextColor );
             SetFont( aFont );
             RoadmapTypes::ItemId curItemID = GetCurrentRoadmapItemID();
-- 
cgit