fdo#82577: Handle Font

Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

5 files changed, 9 insertions, 9 deletions

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index d69e65b1f1b0..deafb418ad4c 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -48,7 +48,7 @@ public:
     FontWidth           GetWidthType()  { if(meWidthType==WIDTH_DONTKNOW)AskConfig(); return meWidthType; }
 
 private:
-    friend class Font;
+    friend class vcl::Font;
     void                AskConfig();
 
     FontRefCount        mnRefCount;
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index dcde57c09ee9..c878d8b2590d 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -30,7 +30,7 @@
 #include "PhysicalFontFace.hxx"
 
 class Size;
-class Font;
+namespace vcl { class Font; }
 class VirtualDevice;
 class ImplGetDevFontList;
 class GetDevSizeList;
@@ -148,7 +148,7 @@ public:
                         ~ImplFontCache();
 
     ImplFontEntry*      GetFontEntry( PhysicalFontCollection*,
-                             const Font&, const Size& rPixelSize, float fExactHeight);
+                             const vcl::Font&, const Size& rPixelSize, float fExactHeight);
     ImplFontEntry*      GetFontEntry( PhysicalFontCollection*, FontSelectPattern& );
     ImplFontEntry*      GetGlyphFallbackFont( PhysicalFontCollection*, FontSelectPattern&,
                             int nFallbackLevel, OUString& rMissingCodes );
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 2fa0862f2034..16a5fdf80410 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -38,7 +38,7 @@ class ImplFontEntry;
 class ImplPreMatchFontSubstitution;
 class ImplGlyphFallbackFontSubstitution;
 class FontSelectPattern;
-class Font;
+namespace vcl { class Font; }
 class ConvertChar;
 struct FontMatchStatus;
 class OutputDevice;
@@ -112,7 +112,7 @@ public: // TODO: hide members behind accessor methods
 class FontSelectPatternAttributes : public ImplFontAttributes
 {
 public:
-                        FontSelectPatternAttributes( const Font&, const OUString& rSearchName,
+                        FontSelectPatternAttributes( const vcl::Font&, const OUString& rSearchName,
                             const Size&, float fExactHeight );
 #ifdef WNT
                         FontSelectPatternAttributes( const PhysicalFontFace&, const Size&,
@@ -144,7 +144,7 @@ public:
 class FontSelectPattern : public FontSelectPatternAttributes
 {
 public:
-                        FontSelectPattern( const Font&, const OUString& rSearchName,
+                        FontSelectPattern( const vcl::Font&, const OUString& rSearchName,
                             const Size&, float fExactHeight );
 #ifdef WNT
 // ifdeffed to prevent it going into unusedcode.easy
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index f0c5e332839c..d047fc54a857 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -36,7 +36,7 @@ class WinSalObject;
 class WinSalFrame;
 class WinSalVirtualDevice;
 class WinSalPrinter;
-class Font;
+namespace vcl { class Font; }
 struct HDCCache;
 struct TempFontItem;
 
@@ -195,7 +195,7 @@ WinSalObject* ImplFindSalObject( HWND hWndChild );
 bool ImplSalPreDispatchMsg( MSG* pMsg );
 void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT nDispatchResult );
 
-void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont );
+void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, vcl::Font& rFont );
 
 rtl_TextEncoding ImplSalGetSystemEncoding();
 OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 nLen = -1);
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 3411ee9fbc25..5ab5cc1b57bf 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -233,7 +233,7 @@ public:
     Pointer             maPointer;
     Fraction            maZoom;
     OUString            maText;
-    Font*               mpControlFont;
+    vcl::Font*          mpControlFont;
     Color               maControlForeground;
     Color               maControlBackground;
     sal_Int32           mnLeftBorder;