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
---
 sfx2/source/control/recentdocsview.cxx | 8 ++++----
 sfx2/source/control/thumbnailview.cxx  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sfx2/source/control')

diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index f88cfbbbb96f..05bb985b3298 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -119,7 +119,7 @@ bool RecentDocsView::isAcceptedFile(const OUString &rURL) const
 
 void RecentDocsView::SetMessageFont()
 {
-    Font aFont(GetFont());
+    vcl::Font aFont(GetFont());
     aFont.SetHeight(aFont.GetHeight()*1.3);
     SetFont(aFont);
 }
@@ -204,7 +204,7 @@ void RecentDocsView::Reload()
     // Set preferred width
     if (mFilteredItemList.empty())
     {
-        Font aOldFont(GetFont());
+        vcl::Font aOldFont(GetFont());
         SetMessageFont();
         set_width_request(std::max(GetTextWidth(maWelcomeLine1), GetTextWidth(maWelcomeLine2)));
         SetFont(aOldFont);
@@ -261,7 +261,7 @@ void RecentDocsView::Paint( const Rectangle &aRect )
     if ( mItemList.size() == 0 )
     {
         // No recent files to be shown yet. Show a welcome screen.
-        Font aOldFont(GetFont());
+        vcl::Font aOldFont(GetFont());
         SetMessageFont();
 
         long nTextHeight = GetTextHeight();
@@ -299,7 +299,7 @@ void RecentDocsView::LoseFocus()
 
 void RecentDocsView::Clear()
 {
-    Font aOldFont(GetFont());
+    vcl::Font aOldFont(GetFont());
     SetMessageFont();
     set_width_request(std::max(GetTextWidth(maWelcomeLine1), GetTextWidth(maWelcomeLine2)));
     SetFont(aOldFont);
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 5c9a20b8dc32..8c0bbee9bc33 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -191,7 +191,7 @@ void ThumbnailView::ImplInitSettings( bool bFont, bool bForeground, bool bBackgr
 
     if ( bFont )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetAppFont();
         if ( IsControlFont() )
             aFont.Merge( GetControlFont() );
-- 
cgit