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
---
 cppcanvas/source/inc/implrenderer.hxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cppcanvas/source/inc')

diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index deb37655e59a..fe3d639e732e 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -37,7 +37,7 @@ class GDIMetaFile;
 class VirtualDevice;
 class Gradient;
 class Rectangle;
-class Font;
+namespace vcl { class Font; }
 class PolyPolygon;
 class Point;
 class MetaCommentAction;
@@ -242,7 +242,7 @@ static float GetSwapFloat( SvStream& rSt )
 
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::rendering::XCanvasFont > createFont( double&                         o_rFontRotation,
-                                                                       const ::Font&                   rFont,
+                                                                       const ::vcl::Font&              rFont,
                                                                        const ActionFactoryParameters&  rParms ) const;
             bool createActions( GDIMetaFile&                    rMtf,
                                 const ActionFactoryParameters&  rParms,
-- 
cgit