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
---
 cui/source/tabpages/numfmt.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'cui/source/tabpages/numfmt.cxx')

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index ebf1a03f6f6d..6937e0c5cd16 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -81,7 +81,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle)
     , mnPos(-1)
     , mnChar(0x0)
 {
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     aFont.SetTransparent( true );
     aFont.SetColor( Application::GetSettings().GetStyleSettings().GetFieldColor() );
     SetFont( aFont );
@@ -149,10 +149,10 @@ void SvxNumberPreview::NotifyChange( const OUString& rPrevStr,
 
 void SvxNumberPreview::Paint( const Rectangle& )
 {
-    Font    aDrawFont   = GetFont();
-    Size    aSzWnd      = GetOutputSizePixel();
-    OUString aTmpStr( aPrevStr );
-    long    nLeadSpace = (aSzWnd.Width()  - GetTextWidth( aTmpStr )) /2;
+    vcl::Font aDrawFont   = GetFont();
+    Size      aSzWnd      = GetOutputSizePixel();
+    OUString  aTmpStr( aPrevStr );
+    long      nLeadSpace = (aSzWnd.Width()  - GetTextWidth( aTmpStr )) /2;
 
     aDrawFont.SetColor( aPrevCol );
     SetFont( aDrawFont );
@@ -830,7 +830,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
 {
     OUString    aEntry;
     OUString    aTmpString;
-    Font        aFont=m_pLbCategory->GetFont();
+    vcl::Font   aFont=m_pLbCategory->GetFont();
     size_t      i = 0;
     short       nTmpCatPos;
     short       aPrivCat;
@@ -877,7 +877,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
             {
                 Color* pPreviewColor = NULL;
                 OUString aPreviewString( GetExpColorString( pPreviewColor, aEntry, aPrivCat ) );
-                Font aEntryFont( m_pLbFormat->GetFont() );
+                vcl::Font aEntryFont( m_pLbFormat->GetFont() );
                 m_pLbFormat->InsertFontEntry( aPreviewString, aEntryFont, pPreviewColor );
             }
             else
-- 
cgit