fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

50 files changed, 198 insertions, 198 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;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 662445cea13d..9e00d4054b45 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1131,9 +1131,9 @@ static Color getColor( NSColor* pSysColor, const Color& rDefault, NSWindow* pWin
     return aRet;
 }
 
-static Font getFont( NSFont* pFont, long nDPIY, const Font& rDefault )
+static vcl::Font getFont( NSFont* pFont, long nDPIY, const vcl::Font& rDefault )
 {
-    Font aResult( rDefault );
+    vcl::Font aResult( rDefault );
     if( pFont )
     {
         aResult.SetName( GetOUString( [pFont familyName] ) );
@@ -1188,7 +1188,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetShadowColor( aShadowColor );
 
     // get the system font settings
-    Font aAppFont = aStyleSettings.GetAppFont();
+    vcl::Font aAppFont = aStyleSettings.GetAppFont();
     sal_Int32 nDPIX = 72, nDPIY = 72;
     getResolution( nDPIX, nDPIY );
     aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont );
@@ -1200,16 +1200,16 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetHelpFont( aAppFont );
     aStyleSettings.SetPushButtonFont( aAppFont );
 
-    Font aTitleFont( getFont( [NSFont titleBarFontOfSize: 0], nDPIY, aAppFont ) );
+    vcl::Font aTitleFont( getFont( [NSFont titleBarFontOfSize: 0], nDPIY, aAppFont ) );
     aStyleSettings.SetTitleFont( aTitleFont );
     aStyleSettings.SetFloatTitleFont( aTitleFont );
 
-    Font aMenuFont( getFont( [NSFont menuFontOfSize: 0], nDPIY, aAppFont ) );
+    vcl::Font aMenuFont( getFont( [NSFont menuFontOfSize: 0], nDPIY, aAppFont ) );
     aStyleSettings.SetMenuFont( aMenuFont );
 
     aStyleSettings.SetToolFont( aAppFont );
 
-    Font aLabelFont( getFont( [NSFont labelFontOfSize: 0], nDPIY, aAppFont ) );
+    vcl::Font aLabelFont( getFont( [NSFont labelFontOfSize: 0], nDPIY, aAppFont ) );
     aStyleSettings.SetLabelFont( aLabelFont );
     aStyleSettings.SetInfoFont( aLabelFont );
     aStyleSettings.SetRadioCheckFont( aLabelFont );
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 3f03d620e377..ed5cb45ccc33 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -48,7 +48,7 @@ void VclComplexTextTest::testArabic()
 
     OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin );
 
-    Font aFont = OutputDevice::GetDefaultFont(
+    vcl::Font aFont = OutputDevice::GetDefaultFont(
                         DEFAULTFONT_CTL_SPREADSHEET,
                         LANGUAGE_ARABIC_SAUDI_ARABIA,
                         DEFAULTFONT_FLAGS_ONLYONE, 0 );
@@ -59,7 +59,7 @@ void VclComplexTextTest::testArabic()
     Rectangle aRect = pOutDev->GetTextRect( aInput, aOneTwoThree );
 
     // now rotate 270 degress
-    Font aRotated( aFont );
+    vcl::Font aRotated( aFont );
     aRotated.SetOrientation( 2700 );
     pOutDev->SetFont( aRotated );
     Rectangle aRectRot = pOutDev->GetTextRect( aInput, aOneTwoThree );
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index fd65cab51c78..7b99b224ed6c 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -338,7 +338,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
         {
             AllSettings aSettings = Application::GetSettings();
             StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-            Font aFont = aStyleSettings.GetAppFont();
+            vcl::Font aFont = aStyleSettings.GetAppFont();
             if ( maBoldAppFont.IsChecked() )
                 aFont.SetWeight( WEIGHT_BOLD );
             else
@@ -387,7 +387,7 @@ DbgInfoDialog::DbgInfoDialog( Window* pParent, bool bHelpText ) :
 
     if ( !bHelpText )
     {
-        Font aFont = GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, 0 );
+        vcl::Font aFont = GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, 0 );
         aFont.SetHeight( 8 );
         aFont.SetPitch( PITCH_FIXED );
         maListBox.SetControlFont( aFont );
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8758bf768bd4..184c3f1db0eb 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -134,19 +134,19 @@ struct ImplStyleData
     Color                           maWorkspaceColor;
     Color                           maActiveTabColor;
     Color                           maInactiveTabColor;
-    Font                            maAppFont;
-    Font                            maHelpFont;
-    Font                            maTitleFont;
-    Font                            maFloatTitleFont;
-    Font                            maMenuFont;
-    Font                            maToolFont;
-    Font                            maLabelFont;
-    Font                            maInfoFont;
-    Font                            maRadioCheckFont;
-    Font                            maPushButtonFont;
-    Font                            maFieldFont;
-    Font                            maIconFont;
-    Font                            maGroupFont;
+    vcl::Font                       maAppFont;
+    vcl::Font                       maHelpFont;
+    vcl::Font                       maTitleFont;
+    vcl::Font                       maFloatTitleFont;
+    vcl::Font                       maMenuFont;
+    vcl::Font                       maToolFont;
+    vcl::Font                       maLabelFont;
+    vcl::Font                       maInfoFont;
+    vcl::Font                       maRadioCheckFont;
+    vcl::Font                       maPushButtonFont;
+    vcl::Font                       maFieldFont;
+    vcl::Font                       maIconFont;
+    vcl::Font                       maGroupFont;
     long                            mnBorderSize;
     long                            mnTitleHeight;
     long                            mnFloatTitleHeight;
@@ -673,7 +673,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
 
 void ImplStyleData::SetStandardStyles()
 {
-    Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
+    vcl::Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
     aStdFont.SetCharSet( osl_getThreadTextEncoding() );
     aStdFont.SetWeight( WEIGHT_NORMAL );
     aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont( LanguageTag("en")) );
@@ -1508,169 +1508,169 @@ StyleSettings::GetCairoFontOptions() const
 }
 
 void
-StyleSettings::SetAppFont( const Font& rFont )
+StyleSettings::SetAppFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maAppFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetAppFont() const
 {
     return mpData->maAppFont;
 }
 
 void
-StyleSettings::SetHelpFont( const Font& rFont )
+StyleSettings::SetHelpFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maHelpFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetHelpFont() const
 {
     return mpData->maHelpFont;
 }
 
 void
-StyleSettings::SetTitleFont( const Font& rFont )
+StyleSettings::SetTitleFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maTitleFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetTitleFont() const
 {
     return mpData->maTitleFont;
 }
 
 void
-StyleSettings::SetFloatTitleFont( const Font& rFont )
+StyleSettings::SetFloatTitleFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maFloatTitleFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetFloatTitleFont() const
 {
     return mpData->maFloatTitleFont;
 }
 
 void
-StyleSettings::SetMenuFont( const Font& rFont )
+StyleSettings::SetMenuFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maMenuFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetMenuFont() const
 {
     return mpData->maMenuFont;
 }
 
 void
-StyleSettings::SetToolFont( const Font& rFont )
+StyleSettings::SetToolFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maToolFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetToolFont() const
 {
     return mpData->maToolFont;
 }
 
 void
-StyleSettings::SetGroupFont( const Font& rFont )
+StyleSettings::SetGroupFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maGroupFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetGroupFont() const
 {
     return mpData->maGroupFont;
 }
 
 void
-StyleSettings::SetLabelFont( const Font& rFont )
+StyleSettings::SetLabelFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maLabelFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetLabelFont() const
 {
     return mpData->maLabelFont;
 }
 
 void
-StyleSettings::SetInfoFont( const Font& rFont )
+StyleSettings::SetInfoFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maInfoFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetInfoFont() const
 {
     return mpData->maInfoFont;
 }
 
 void
-StyleSettings::SetRadioCheckFont( const Font& rFont )
+StyleSettings::SetRadioCheckFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maRadioCheckFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetRadioCheckFont() const
 {
     return mpData->maRadioCheckFont;
 }
 
 void
-StyleSettings::SetPushButtonFont( const Font& rFont )
+StyleSettings::SetPushButtonFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maPushButtonFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetPushButtonFont() const
 {
     return mpData->maPushButtonFont;
 }
 
 void
-StyleSettings::SetFieldFont( const Font& rFont )
+StyleSettings::SetFieldFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maFieldFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetFieldFont() const
 {
     return mpData->maFieldFont;
 }
 
 void
-StyleSettings::SetIconFont( const Font& rFont )
+StyleSettings::SetIconFont( const vcl::Font& rFont )
 {
     CopyData();
     mpData->maIconFont = rFont;
 }
 
-const Font&
+const vcl::Font&
 StyleSettings::GetIconFont() const
 {
     return mpData->maIconFont;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 0cbc46548223..bfc7fd26976a 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -635,7 +635,7 @@ WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
     return nStyle;
 }
 
-const Font& PushButton::GetCanonicalFont( const StyleSettings& _rStyle ) const
+const vcl::Font& PushButton::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetPushButtonFont();
 }
@@ -1322,7 +1322,7 @@ void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     Point       aPos  = pDev->LogicToPixel( rPos );
     Size        aSize = pDev->LogicToPixel( rSize );
     Rectangle   aRect( aPos, aSize );
-    Font        aFont = GetDrawPixelFont( pDev );
+    vcl::Font   aFont = GetDrawPixelFont( pDev );
 
     pDev->Push();
     pDev->SetMapMode();
@@ -1801,7 +1801,7 @@ WinBits RadioButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
     return nStyle;
 }
 
-const Font& RadioButton::GetCanonicalFont( const StyleSettings& _rStyle ) const
+const vcl::Font& RadioButton::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetRadioCheckFont();
 }
@@ -2419,7 +2419,7 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize
         Size        aImageSize = pDev->LogicToPixel( Size( 300, 300 ), aResMapMode );
         Size        aBrd1Size = pDev->LogicToPixel( Size( 20, 20 ), aResMapMode );
         Size        aBrd2Size = pDev->LogicToPixel( Size( 60, 60 ), aResMapMode );
-        Font        aFont = GetDrawPixelFont( pDev );
+        vcl::Font   aFont = GetDrawPixelFont( pDev );
         Rectangle   aStateRect;
         Rectangle   aMouseRect;
 
@@ -2914,7 +2914,7 @@ WinBits CheckBox::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
     return nStyle;
 }
 
-const Font& CheckBox::GetCanonicalFont( const StyleSettings& _rStyle ) const
+const vcl::Font& CheckBox::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetRadioCheckFont();
 }
@@ -3300,7 +3300,7 @@ void CheckBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     Size        aBrd1Size = pDev->LogicToPixel( Size( 20, 20 ), aResMapMode );
     Size        aBrd2Size = pDev->LogicToPixel( Size( 30, 30 ), aResMapMode );
     long        nCheckWidth = pDev->LogicToPixel( Size( 20, 20 ), aResMapMode ).Width();
-    Font        aFont = GetDrawPixelFont( pDev );
+    vcl::Font   aFont = GetDrawPixelFont( pDev );
     Rectangle   aStateRect;
     Rectangle   aMouseRect;
 
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 93d6c295dc07..be4c071c5ea6 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1125,7 +1125,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, s
 
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );
-    Font aFont = mpImplLB->GetMainWindow().GetDrawPixelFont( pDev );
+    vcl::Font aFont = mpImplLB->GetMainWindow().GetDrawPixelFont( pDev );
     OutDevType eOutDevType = pDev->GetOutDevType();
 
     pDev->Push();
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 8c5ac2e0dd37..83a977d00fb6 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -394,7 +394,7 @@ OutputDevice* Control::GetReferenceDevice() const
     return mpControlData->mpReferenceDevice;
 }
 
-const Font& Control::GetCanonicalFont( const StyleSettings& _rStyle ) const
+const vcl::Font& Control::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetLabelFont();
 }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 404a0a00d2de..8be4dc8be560 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -386,7 +386,7 @@ void Edit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
 
     if ( bFont )
     {
-        Font aFont = rStyleSettings.GetFieldFont();
+        vcl::Font aFont = rStyleSettings.GetFieldFont();
         if ( IsControlFont() )
             aFont.Merge( GetControlFont() );
         SetZoomedPointFont( aFont );
@@ -654,7 +654,7 @@ void Edit::ImplRepaint(bool bLayout)
                     aClip.Intersect(aRegion);
                     if( !aClip.IsEmpty() && nAttr )
                     {
-                        Font aFont = GetFont();
+                        vcl::Font aFont = GetFont();
                         if ( nAttr & EXTTEXTINPUT_ATTR_UNDERLINE )
                             aFont.SetUnderline( UNDERLINE_SINGLE );
                         else if ( nAttr & EXTTEXTINPUT_ATTR_BOLDUNDERLINE )
@@ -1775,7 +1775,7 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_u
 
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );
-    Font aFont = GetDrawPixelFont( pDev );
+    vcl::Font aFont = GetDrawPixelFont( pDev );
     OutDevType eOutDevType = pDev->GetOutDevType();
 
     pDev->Push();
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 35f6dab6d574..8d6cb0f8c9a6 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -94,7 +94,7 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-const Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const
+const vcl::Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont();
 }
@@ -246,7 +246,7 @@ void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
 
     Point       aPos  = pDev->LogicToPixel( rPos );
     Size        aSize = pDev->LogicToPixel( rSize );
-    Font        aFont = GetDrawPixelFont( pDev );
+    vcl::Font   aFont = GetDrawPixelFont( pDev );
 
     pDev->Push();
     pDev->SetMapMode();
@@ -497,7 +497,7 @@ WinBits FixedLine::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-const Font& FixedLine::GetCanonicalFont( const StyleSettings& _rStyle ) const
+const vcl::Font& FixedLine::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetGroupFont();
 }
@@ -565,7 +565,7 @@ void FixedLine::ImplDraw( bool bLayout )
     {
         long nWidth = GetTextWidth( aText );
         Push( PUSH_FONT );
-        Font aFont( GetFont() );
+        vcl::Font aFont( GetFont() );
         aFont.SetOrientation( 900 );
         SetFont( aFont );
         Point aStartPt( aOutSize.Width()/2, aOutSize.Height()-1 );
diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx
index ce16866a636f..f30a8ba9303f 100644
--- a/vcl/source/control/fixedhyper.cxx
+++ b/vcl/source/control/fixedhyper.cxx
@@ -35,7 +35,7 @@ void FixedHyperlink::Initialize()
     // saves the old pointer
     m_aOldPointer = GetPointer();
     // changes the font
-    Font aFont = GetControlFont( );
+    vcl::Font aFont = GetControlFont( );
     // to underline
     aFont.SetUnderline( UNDERLINE_SINGLE );
     SetControlFont( aFont );
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 320cade9ee77..47f97a55a28b 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -45,7 +45,7 @@ WinBits GroupBox::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-const Font& GroupBox::GetCanonicalFont( const StyleSettings& _rStyle ) const
+const vcl::Font& GroupBox::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetGroupFont();
 }
@@ -198,7 +198,7 @@ void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
 {
     Point       aPos  = pDev->LogicToPixel( rPos );
     Size        aSize = pDev->LogicToPixel( rSize );
-    Font        aFont = GetDrawPixelFont( pDev );
+    vcl::Font   aFont = GetDrawPixelFont( pDev );
 
     pDev->Push();
     pDev->SetMapMode();
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 75c7d2cbe16e..187b6469e046 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -52,7 +52,7 @@ void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBa
 
     if ( bFont )
     {
-        Font aFont = rStyleSettings.GetFieldFont();
+        vcl::Font aFont = rStyleSettings.GetFieldFont();
         if ( pWin->IsControlFont() )
             aFont.Merge( pWin->GetControlFont() );
         pWin->SetZoomedPointFont( aFont );
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 02a54ba59ced..ec4d4bc65abe 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -373,7 +373,7 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sa
 
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );
-    Font aFont = mpImplLB->GetMainWindow().GetDrawPixelFont( pDev );
+    vcl::Font aFont = mpImplLB->GetMainWindow().GetDrawPixelFont( pDev );
     OutDevType eOutDevType = pDev->GetOutDevType();
 
     pDev->Push();
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 223705e714c3..0187b4e51b68 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -127,7 +127,7 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle )
         pParent->AddChildEventListener( LINK( this, TabControl, ImplWindowEventListener ) );
 }
 
-const Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const
+const vcl::Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetAppFont();
 }
@@ -400,7 +400,7 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, long nHe
 
     if ( mbFormat || (mnLastWidth != nWidth) || (mnLastHeight != nHeight) )
     {
-        Font aFont( GetFont() );
+        vcl::Font aFont( GetFont() );
         aFont.SetTransparent( true );
         SetFont( aFont );
 
@@ -918,7 +918,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo
 
     // set font accordingly, current item is painted bold
     // we set the font attributes always before drawing to be re-entrant (DrawNativeControl may trigger additional paints)
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     aFont.SetTransparent( true );
     SetFont( aFont );
 
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 9fb2e5c62ffe..b70cd2be405f 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -102,7 +102,7 @@ TextEngine::TextEngine()
     ImpInitDoc();
 
     maTextColor = COL_BLACK;
-    Font aFont;
+    vcl::Font aFont;
     aFont.SetTransparent( false );
     Color aFillColor( aFont.GetFillColor() );
     aFillColor.SetTransparency( 0 );
@@ -170,7 +170,7 @@ void TextEngine::SetActiveView( TextView* pTextView )
     }
 }
 
-void TextEngine::SetFont( const Font& rFont )
+void TextEngine::SetFont( const vcl::Font& rFont )
 {
     if ( rFont != maFont )
     {
@@ -1130,7 +1130,7 @@ sal_uInt16 TextEngine::GetCharPos( sal_uLong nPortion, sal_uInt16 nLine, long nX
             {
                 nTmpX -= pTextPortion->GetWidth();  // position before Portion
                 // TODO: Optimize: no GetTextBreak if fixed-width Font
-                Font aFont;
+                vcl::Font aFont;
                 SeekCursor( nPortion, nCurIndex+1, aFont, NULL );
                 mpRefDev->SetFont( aFont);
                 long nPosInPortion = nXPos-nTmpX;
@@ -1213,7 +1213,7 @@ sal_uLong TextEngine::CalcTextHeight()
     return nY;
 }
 
-sal_uLong TextEngine::CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart, sal_uInt16 nLen, const Font* pFont )
+sal_uLong TextEngine::CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart, sal_uInt16 nLen, const vcl::Font* pFont )
 {
 #ifdef DBG_UTIL
     // within the text there must not be a Portion change (attribute/tab)!
@@ -1235,7 +1235,7 @@ sal_uLong TextEngine::CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart,
         }
         else
         {
-            Font aFont;
+            vcl::Font aFont;
             SeekCursor( nPara, nPortionStart+1, aFont, NULL );
             mpRefDev->SetFont( aFont );
         }
@@ -1392,7 +1392,7 @@ TextPaM TextEngine::ConnectContents( sal_uLong nLeftNode )
     return ImpConnectParagraphs( nLeftNode, nLeftNode+1 );
 }
 
-void TextEngine::SeekCursor( sal_uLong nPara, sal_uInt16 nPos, Font& rFont, OutputDevice* pOutDev )
+void TextEngine::SeekCursor( sal_uLong nPara, sal_uInt16 nPos, vcl::Font& rFont, OutputDevice* pOutDev )
 {
     rFont = maFont;
     if ( pOutDev )
@@ -2011,7 +2011,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
                                 case PORTIONKIND_TEXT:
                                 {
                                     {
-                                        Font aFont;
+                                        vcl::Font aFont;
                                         SeekCursor( nPara, nIndex+1, aFont, pOutDev );
                                         if( bTransparent )
                                             aFont.SetTransparent( true );
@@ -2246,7 +2246,7 @@ bool TextEngine::CreateLines( sal_uLong nPara )
     sal_uInt16 nIndex = pLine->GetStart();
     TextLine aSaveLine( *pLine );
 
-    Font aFont;
+    vcl::Font aFont;
 
     bool bCalcPortion = true;
 
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index b607caf7abf9..d63620d40016 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -300,7 +300,7 @@ void TextView::ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle c
     {
         // set correct background color;
         // unfortunately we cannot detect if it has changed
-        Font aFont = mpImpl->mpTextEngine->GetFont();
+        vcl::Font aFont = mpImpl->mpTextEngine->GetFont();
         Color aColor = pOut->GetBackground().GetColor();
         aColor.SetTransparency( 0 );
         if ( aColor != aFont.GetFillColor() )
diff --git a/vcl/source/edit/txtattr.cxx b/vcl/source/edit/txtattr.cxx
index c7d0c592a44d..2baa47bc213f 100644
--- a/vcl/source/edit/txtattr.cxx
+++ b/vcl/source/edit/txtattr.cxx
@@ -43,7 +43,7 @@ TextAttribFontColor::~TextAttribFontColor()
 {
 }
 
-void TextAttribFontColor::SetFont( Font& rFont ) const
+void TextAttribFontColor::SetFont( vcl::Font& rFont ) const
 {
     rFont.SetColor( maColor );
 }
@@ -73,7 +73,7 @@ TextAttribFontWeight::~TextAttribFontWeight()
 {
 }
 
-void TextAttribFontWeight::SetFont( Font& rFont ) const
+void TextAttribFontWeight::SetFont( vcl::Font& rFont ) const
 {
     rFont.SetWeight( meWeight );
 }
@@ -99,7 +99,7 @@ TextAttribHyperLink::~TextAttribHyperLink()
 {
 }
 
-void TextAttribHyperLink::SetFont( Font& rFont ) const
+void TextAttribHyperLink::SetFont( vcl::Font& rFont ) const
 {
     rFont.SetColor( maColor );
     rFont.SetUnderline( UNDERLINE_SINGLE );
@@ -132,7 +132,7 @@ TextAttribProtect::~TextAttribProtect()
 {
 }
 
-void TextAttribProtect::SetFont( Font& ) const
+void TextAttribProtect::SetFont( vcl::Font& ) const
 {
 }
 
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 6dee58f92c99..68c375a6a200 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -974,12 +974,12 @@ void VclMultiLineEdit::ImplInitSettings( bool /*bFont*/, bool /*bForeground*/, b
     if ( !IsEnabled() )
         aTextColor = rStyleSettings.GetDisableColor();
 
-    Font aFont = rStyleSettings.GetFieldFont();
+    vcl::Font aFont = rStyleSettings.GetFieldFont();
     if ( IsControlFont() )
         aFont.Merge( GetControlFont() );
     aFont.SetTransparent( IsPaintTransparent() );
     SetZoomedPointFont( aFont );
-    Font TheFont = GetFont();
+    vcl::Font TheFont = GetFont();
     TheFont.SetColor( aTextColor );
     if( IsPaintTransparent() )
         TheFont.SetFillColor( Color( COL_TRANSPARENT ) );
@@ -1304,7 +1304,7 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size&
 
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );
-    Font aFont = pImpVclMEdit->GetTextWindow()->GetDrawPixelFont( pDev );
+    vcl::Font aFont = pImpVclMEdit->GetTextWindow()->GetDrawPixelFont( pDev );
     aFont.SetTransparent( true );
     OutDevType eOutDevType = pDev->GetOutDevType();
 
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index bafcdfa4b442..5726c9e75299 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -460,7 +460,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
                       sal_uInt16 FitXMul, sal_uInt16 FitXDiv, sal_uInt16 FitYMul, sal_uInt16 FitYDiv)
 {
     SgfFontOne* pSgfFont; // Font from the IniFile
-    Font   aFont;
+    vcl::Font   aFont;
     Color  aColor;
     sal_uLong  Grad;
     sal_uLong  Brei;
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 08461a3bd9ea..b9144f3e7986 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -502,11 +502,11 @@ void EMFWriter::ImplCheckTextAttr()
 {
     if( mbTextChanged && ImplPrepareHandleSelect( mnTextHandle, TEXT_SELECT ) )
     {
-        const Font&     rFont = maVDev.GetFont();
-        OUString        aFontName( rFont.GetName() );
-        sal_Int32       nWeight;
-        sal_uInt16      i;
-        sal_uInt8       nPitchAndFamily;
+        const vcl::Font& rFont = maVDev.GetFont();
+        OUString         aFontName( rFont.GetName() );
+        sal_Int32        nWeight;
+        sal_uInt16       i;
+        sal_uInt8        nPitchAndFamily;
 
         ImplBeginRecord( WIN_EMR_EXTCREATEFONTINDIRECTW );
         m_rStm.WriteUInt32( mnTextHandle );
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 736ac69b8578..f0bfad144c85 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -462,7 +462,7 @@ Rectangle WinMtfOutput::ImplMap( const Rectangle& rRect )
     return Rectangle( ImplMap( rRect.TopLeft() ), ImplMap( rRect.GetSize() ) );
 }
 
-void WinMtfOutput::ImplMap( Font& rFont )
+void WinMtfOutput::ImplMap( vcl::Font& rFont )
 {
     // !!! HACK: we now always set the width to zero because the OS width is interpreted differently;
     // must later be made portable in SV (KA 1996-02-08)
@@ -1394,7 +1394,7 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, long* pDXArry, b
         bChangeFont = true;
         mpGDIMetaFile->AddAction( new MetaTextFillColorAction( maFont.GetFillColor(), !maFont.IsTransparent() ) );
     }
-    Font aTmp( maFont );
+    vcl::Font aTmp( maFont );
     aTmp.SetColor( maTextColor );
     aTmp.SetFillColor( maBkColor );
 
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index e5fe7ae1f337..5ce0dfd93ccf 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -327,7 +327,7 @@ public:
 
 struct WinMtfFontStyle
 {
-    Font    aFont;
+    vcl::Font    aFont;
 
     WinMtfFontStyle( LOGFONTW& rLogFont );
 };
@@ -479,7 +479,7 @@ struct SaveStruct
     WinMtfLineStyle     aLineStyle;
     WinMtfFillStyle     aFillStyle;
 
-    Font                aFont;
+    vcl::Font           aFont;
     Color               aBkColor;
     Color               aTextColor;
     sal_uInt32          nTextAlign;
@@ -586,8 +586,8 @@ class WinMtfOutput
     WinMtfLineStyle     maLineStyle;
     WinMtfFillStyle     maLatestFillStyle;
     WinMtfFillStyle     maFillStyle;
-    Font                maLatestFont;
-    Font                maFont;
+    vcl::Font           maLatestFont;
+    vcl::Font           maFont;
     sal_uInt32          mnLatestTextAlign;
     sal_uInt32          mnTextAlign;
     Color               maLatestTextColor;
@@ -638,7 +638,7 @@ class WinMtfOutput
     Point               ImplScale( const Point& rPt );
     Size                ImplMap( const Size& rSize, bool bDoWorldTransform = true);
     Rectangle           ImplMap( const Rectangle& rRectangle );
-    void                ImplMap( Font& rFont );
+    void                ImplMap( vcl::Font& rFont );
     Polygon&            ImplMap( Polygon& rPolygon );
     PolyPolygon&        ImplMap( PolyPolygon& rPolyPolygon );
     Polygon&            ImplScale( Polygon& rPolygon );
@@ -690,7 +690,7 @@ public:
     void                SelectObject( sal_Int32 nIndex );
     rtl_TextEncoding    GetCharSet(){ return maFont.GetCharSet(); };
     WinMtfFillStyle&    GetFillStyle () { return maFillStyle; }
-    const Font&         GetFont() const { return maFont;}
+    const vcl::Font&    GetFont() const { return maFont;}
     void                SetTextLayoutMode( ComplexTextLayoutMode nLayoutMode );
 
     void                ClearPath(){ aPathObj.Init(); };
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 8dde397668b0..5d64ad9b8e8f 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -302,7 +302,7 @@ void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor)
     pWMF->WriteUInt16( (sal_uInt16) 0 );
 }
 
-void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
+void WMFWriter::WMFRecord_CreateFontIndirect(const vcl::Font & rFont)
 {
     sal_uInt16 nWeight,i;
     sal_uInt8 nPitchFamily;
@@ -873,7 +873,7 @@ void WMFWriter::CreateSelectDeletePen( const Color& rColor, const LineInfo& rLin
     }
 }
 
-void WMFWriter::CreateSelectDeleteFont(const Font & rFont)
+void WMFWriter::CreateSelectDeleteFont(const vcl::Font & rFont)
 {
     sal_uInt16 nOldHandle;
 
@@ -1776,7 +1776,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
     aDstClipRegion = aSrcClipRegion = Region();
     bDstIsClipping = bSrcIsClipping = false;
 
-    Font aFont;
+    vcl::Font aFont;
     aFont.SetCharSet( GetExtendedTextEncoding( RTL_TEXTENCODING_MS_1252 ) );
     aFont.SetColor( Color( COL_WHITE ) );
     aFont.SetAlign( ALIGN_BASELINE );
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index 378ece4d4078..a4ce97ace9ca 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -37,7 +37,7 @@ struct WMFWriterAttrStackMember
     LineInfo aLineInfo;
     TextAlign eTextAlign;
     RasterOp eRasterOp;
-    Font aFont;
+    vcl::Font aFont;
     MapMode aMapMode;
     Region aClipRegion;
     PushFlags nFlags;
@@ -73,7 +73,7 @@ private:
     LineInfo  aSrcLineInfo;
     RasterOp  eSrcRasterOp;
     FontAlign eSrcTextAlign;
-    Font      aSrcFont;
+    vcl::Font aSrcFont;
     MapMode   aSrcMapMode;
     bool      bSrcIsClipping;
     Region    aSrcClipRegion;
@@ -88,7 +88,7 @@ private:
     LineInfo  aDstLineInfo;
     RasterOp  eDstROP2;
     FontAlign eDstTextAlign;
-    Font      aDstFont;
+    vcl::Font aDstFont;
 
     sal_uInt32    eDstHorTextAlign;
 
@@ -138,7 +138,7 @@ private:
     void WMFRecord_Arc(const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt);
     void WMFRecord_Chord(const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt);
     void WMFRecord_CreateBrushIndirect(const Color& rColor);
-    void WMFRecord_CreateFontIndirect(const Font& rFont);
+    void WMFRecord_CreateFontIndirect(const vcl::Font& rFont);
     void WMFRecord_CreatePenIndirect(const Color& rColor, const LineInfo& rLineInfo );
     void WMFRecord_DeleteObject(sal_uInt16 nObjectHandle);
     void WMFRecord_Ellipse(const Rectangle& rRect);
@@ -176,7 +176,7 @@ private:
     sal_uInt16 AllocHandle();
     void FreeHandle(sal_uInt16 nObjectHandle);
     void CreateSelectDeletePen( const Color& rColor, const LineInfo& rLineInfo );
-    void CreateSelectDeleteFont(const Font & rFont);
+    void CreateSelectDeleteFont(const vcl::Font & rFont);
     void CreateSelectDeleteBrush(const Color& rColor);
 
     void SetLineAndFillAttr();
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index d49044c3ca54..efab97eaa223 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -199,7 +199,7 @@ void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle
     }
 }
 
-void ImplWriteFont( SvStream& rOStm, const Font& rFont,
+void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont,
                     rtl_TextEncoding& rActualCharSet )
 {
     char    aName[32];
@@ -784,8 +784,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_FONT_ACTION ):
                 {
-                    Font    aFont;
-                    char    aName[ 32 ];
+                    vcl::Font   aFont;
+                    char        aName[ 32 ];
                     sal_Int32   nWidth, nHeight;
                     sal_Int16   nCharSet, nFamily, nPitch, nAlign, nWeight, nUnderline, nStrikeout;
                     sal_Int16   nCharOrient, nLineOrient;
@@ -1346,9 +1346,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
 void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf )
 {
-    sal_uLong               nCountPos;
-    Font                aSaveFont;
-    const sal_uInt16        nOldFormat = rOStm.GetNumberFormatInt();
+    sal_uLong           nCountPos;
+    vcl::Font           aSaveFont;
+    const sal_uInt16    nOldFormat = rOStm.GetNumberFormatInt();
     rtl_TextEncoding    eActualCharSet = osl_getThreadTextEncoding();
     const Size          aPrefSize( rMtf.GetPrefSize() );
     bool                bRop_0_1 = false;
@@ -2013,7 +2013,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_TEXTCOLOR_ACTION ):
             {
-                Font aSaveFont( rSaveVDev.GetFont() );
+                vcl::Font aSaveFont( rSaveVDev.GetFont() );
 
                 aSaveFont.SetColor( ( (MetaTextColorAction*) pAction )->GetColor() );
                 rSaveVDev.SetFont( aSaveFont );
@@ -2025,7 +2025,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
             case( META_TEXTFILLCOLOR_ACTION ):
             {
                 MetaTextFillColorAction*    pAct = (MetaTextFillColorAction*) pAction;
-                Font                        aSaveFont( rSaveVDev.GetFont() );
+                vcl::Font                   aSaveFont( rSaveVDev.GetFont() );
 
                 if( pAct->IsSetting() )
                     aSaveFont.SetFillColor( pAct->GetColor() );
@@ -2040,7 +2040,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
             case( META_TEXTALIGN_ACTION ):
             {
-                Font aSaveFont( rSaveVDev.GetFont() );
+                vcl::Font aSaveFont( rSaveVDev.GetFont() );
 
                 aSaveFont.SetAlign( ( (MetaTextAlignAction*) pAction )->GetTextAlign() );
                 rSaveVDev.SetFont( aSaveFont );
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 233babad24b4..d556cdab11db 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -232,7 +232,7 @@ Font::Font()
     mpImplFont = &aStaticImplFont;
 }
 
-Font::Font( const Font& rFont )
+Font::Font( const vcl::Font& rFont )
 {
     bool bRefIncrementable = rFont.mpImplFont->mnRefCount < ::std::numeric_limits<FontRefCount>::max();
     DBG_ASSERT( bRefIncrementable, "Font: RefCount overflow" );
@@ -563,7 +563,7 @@ void Font::SetWordLineMode( bool bWordLine )
     }
 }
 
-Font& Font::operator=( const Font& rFont )
+Font& Font::operator=( const vcl::Font& rFont )
 {
     bool bRefIncrementable = rFont.mpImplFont->mnRefCount < ::std::numeric_limits<FontRefCount>::max();
     DBG_ASSERT( bRefIncrementable, "Font: RefCount overflow" );
@@ -588,12 +588,12 @@ Font& Font::operator=( const Font& rFont )
     return *this;
 }
 
-bool Font::operator==( const Font& rFont ) const
+bool Font::operator==( const vcl::Font& rFont ) const
 {
     return mpImplFont == rFont.mpImplFont || *mpImplFont == *rFont.mpImplFont;
 }
 
-void Font::Merge( const Font& rFont )
+void Font::Merge( const vcl::Font& rFont )
 {
     if ( !rFont.GetName().isEmpty() )
     {
@@ -736,13 +736,13 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font )
     return rOStm;
 }
 
-SvStream& ReadFont( SvStream& rIStm, Font& rFont )
+SvStream& ReadFont( SvStream& rIStm, ::vcl::Font& rFont )
 {
     rFont.MakeUnique();
     return ReadImpl_Font( rIStm, *rFont.mpImplFont );
 }
 
-SvStream& WriteFont( SvStream& rOStm, const Font& rFont )
+SvStream& WriteFont( SvStream& rOStm, const ::vcl::Font& rFont )
 {
     return WriteImpl_Font( rOStm, *rFont.mpImplFont );
 }
@@ -1020,6 +1020,6 @@ FontEmphasisMark Font::GetEmphasisMark() const { return mpImplFont->meEmphasisMa
 
 bool Font::IsWordLineMode() const { return mpImplFont->mbWordLine; }
 
-bool Font::IsSameInstance( const Font& rFont ) const { return (mpImplFont == rFont.mpImplFont); }
+bool Font::IsSameInstance( const vcl::Font& rFont ) const { return (mpImplFont == rFont.mpImplFont); }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 480e0ab68d94..3bd6eb2ccb36 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1322,7 +1322,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                 case( META_FONT_ACTION ):
                 {
                     MetaFontAction* pAct = (MetaFontAction*) pAction;
-                    Font            aFont( pAct->GetFont() );
+                    vcl::Font       aFont( pAct->GetFont() );
 
                     aFont.SetOrientation( aFont.GetOrientation() + (sal_uInt16) nAngle10 );
                     aMtf.AddAction( new MetaFontAction( aFont ) );
@@ -2006,7 +2006,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
             case( META_FONT_ACTION ):
             {
                 MetaFontAction* pAct = (MetaFontAction*) pAction;
-                Font            aFont( pAct->GetFont() );
+                vcl::Font       aFont( pAct->GetFont() );
 
                 aFont.SetColor( pFncCol( aFont.GetColor(), pColParam ) );
                 aFont.SetFillColor( pFncCol( aFont.GetFillColor(), pColParam ) );
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index d6041226d82e..f628f5595943 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -34,7 +34,7 @@
 using namespace ::com::sun::star;
 
 static void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText,
-                             Font* pFont, const Bitmap* pBitmap, const BitmapEx* pBitmapEx,
+                             vcl::Font* pFont, const Bitmap* pBitmap, const BitmapEx* pBitmapEx,
                              const Point& rDestPt, const Size& rDestSize )
 {
     sal_uInt16      nPixel = (sal_uInt16) pOutDev->PixelToLogic( Size( 1, 1 ) ).Width();
@@ -456,7 +456,7 @@ void Graphic::Draw( OutputDevice* pOutDev,
 }
 
 void Graphic::DrawEx( OutputDevice* pOutDev, const OUString& rText,
-                    Font& rFont, const BitmapEx& rBitmap,
+                    vcl::Font& rFont, const BitmapEx& rBitmap,
                     const Point& rDestPt, const Size& rDestSz )
 {
     ImplDrawDefault( pOutDev, &rText, &rFont, NULL, &rBitmap, rDestPt, rDestSz );
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 2417e0ff4de1..c6b524b4243b 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -3051,7 +3051,7 @@ MetaFontAction::MetaFontAction() :
 MetaFontAction::~MetaFontAction()
 {}
 
-MetaFontAction::MetaFontAction( const Font& rFont ) :
+MetaFontAction::MetaFontAction( const vcl::Font& rFont ) :
     MetaAction  ( META_FONT_ACTION ),
     maFont      ( rFont )
 {
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 81e29a9a1c35..c0f0a695abed 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -57,7 +57,7 @@ void PDFWriter::SetDocumentLocale( const com::sun::star::lang::Locale& rLoc )
     pImplementation->setDocumentLocale( rLoc );
 }
 
-void PDFWriter::SetFont( const Font& rFont )
+void PDFWriter::SetFont( const vcl::Font& rFont )
 {
     pImplementation->setFont( rFont );
 }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 7e9e422d4644..c73d3e22d206 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4611,7 +4611,7 @@ bool PDFWriterImpl::emitNoteAnnotations()
     return true;
 }
 
-Font PDFWriterImpl::replaceFont( const Font& rControlFont, const Font&  rAppSetFont )
+Font PDFWriterImpl::replaceFont( const vcl::Font& rControlFont, const vcl::Font&  rAppSetFont )
 {
     bool bAdjustSize = false;
 
@@ -4643,7 +4643,7 @@ Font PDFWriterImpl::replaceFont( const Font& rControlFont, const Font&  rAppSetF
     return aFont;
 }
 
-sal_Int32 PDFWriterImpl::getBestBuiltinFont( const Font& rFont )
+sal_Int32 PDFWriterImpl::getBestBuiltinFont( const vcl::Font& rFont )
 {
     sal_Int32 nBest = 4; // default to Helvetica
     OUString aFontName( rFont.GetName() );
@@ -6969,7 +6969,7 @@ bool PDFWriterImpl::emit()
 }
 
 
-sal_Int32 PDFWriterImpl::getSystemFont( const Font& i_rFont )
+sal_Int32 PDFWriterImpl::getSystemFont( const vcl::Font& i_rFont )
 {
     getReferenceDevice()->Push();
     getReferenceDevice()->SetFont( i_rFont );
@@ -10604,7 +10604,7 @@ void PDFWriterImpl::updateGraphicsState(Mode const mode)
 *  if a font with a nontransparent color is set, it overwrites the current
 *  text color. OTOH setting the text color will overwrite the color of the font.
 */
-void PDFWriterImpl::setFont( const Font& rFont )
+void PDFWriterImpl::setFont( const vcl::Font& rFont )
 {
     Color aColor = rFont.GetColor();
     if( aColor == Color( COL_TRANSPARENT ) )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 201528131b1c..655881de8ade 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -701,7 +701,7 @@ private:
     // graphics state
     struct GraphicsState
     {
-        Font                             m_aFont;
+        vcl::Font                       m_aFont;
         MapMode                          m_aMapMode;
         Color                            m_aLineColor;
         Color                            m_aFillColor;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index df15630fc39e..116a2752d6ba 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -101,7 +101,7 @@ bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const
     return (pFound != NULL);
 }
 
-int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const
+int OutputDevice::GetDevFontSizeCount( const vcl::Font& rFont ) const
 {
     delete mpGetDevSizeList;
 
@@ -110,7 +110,7 @@ int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const
     return mpGetDevSizeList->Count();
 }
 
-Size OutputDevice::GetDevFontSize( const Font& rFont, int nSizeIndex ) const
+Size OutputDevice::GetDevFontSize( const vcl::Font& rFont, int nSizeIndex ) const
 {
     // check range
     int nCount = GetDevFontSizeCount( rFont );
@@ -206,7 +206,7 @@ FontMetric OutputDevice::GetFontMetric() const
     return aMetric;
 }
 
-FontMetric OutputDevice::GetFontMetric( const Font& rFont ) const
+FontMetric OutputDevice::GetFontMetric( const vcl::Font& rFont ) const
 {
     // select font, query metrics, select original font again
     Font aOldFont = GetFont();
@@ -422,7 +422,7 @@ void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, bool& rPolyLine,
         rYOff += nDotSize;
 }
 
-FontEmphasisMark OutputDevice::ImplGetEmphasisMarkStyle( const Font& rFont )
+FontEmphasisMark OutputDevice::ImplGetEmphasisMarkStyle( const vcl::Font& rFont )
 {
     FontEmphasisMark nEmphasisMark = rFont.GetEmphasisMark();
 
@@ -995,7 +995,7 @@ void ImplFontEntry::IgnoreFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight
         mpUnicodeFallbackList->erase( it );
 }
 
-FontSelectPatternAttributes::FontSelectPatternAttributes( const Font& rFont,
+FontSelectPatternAttributes::FontSelectPatternAttributes( const vcl::Font& rFont,
     const OUString& rSearchName, const Size& rSize, float fExactHeight )
     : maSearchName( rSearchName )
     , mnWidth( rSize.Width() )
@@ -1027,7 +1027,7 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const Font& rFont,
         mnWidth = -mnWidth;
 }
 
-FontSelectPattern::FontSelectPattern( const Font& rFont,
+FontSelectPattern::FontSelectPattern( const vcl::Font& rFont,
     const OUString& rSearchName, const Size& rSize, float fExactHeight)
     : FontSelectPatternAttributes(rFont, rSearchName, rSize, fExactHeight)
     , mpFontData( NULL )
@@ -1212,7 +1212,7 @@ ImplFontCache::~ImplFontCache()
 }
 
 ImplFontEntry* ImplFontCache::GetFontEntry( PhysicalFontCollection* pFontList,
-    const Font& rFont, const Size& rSize, float fExactHeight )
+    const vcl::Font& rFont, const Size& rSize, float fExactHeight )
 {
     OUString aSearchName = rFont.GetName();
 
@@ -2143,7 +2143,7 @@ bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString& rSt
     return (nLen == (int)rVector.size());
 }
 
-sal_Int32 OutputDevice::HasGlyphs( const Font& rTempFont, const OUString& rStr,
+sal_Int32 OutputDevice::HasGlyphs( const vcl::Font& rTempFont, const OUString& rStr,
     sal_Int32 nIndex, sal_Int32 nLen ) const
 {
     if( nIndex >= rStr.getLength() )
@@ -2158,7 +2158,7 @@ sal_Int32 OutputDevice::HasGlyphs( const Font& rTempFont, const OUString& rStr,
     DBG_ASSERT( nEnd <= rStr.getLength(), "String too short" );
 
     // to get the map temporarily set font
-    const Font aOrigFont = GetFont();
+    const vcl::Font aOrigFont = GetFont();
     const_cast<OutputDevice&>(*this).SetFont( rTempFont );
     FontCharMap aFontCharMap;
     bool bRet = GetFontCharMap( aFontCharMap );
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 77dfe722fa0e..809408a1411d 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -90,7 +90,7 @@ void OutputDevice::Push( PushFlags nFlags )
             pState->mpFillColor = NULL;
     }
     if ( nFlags & PUSH_FONT )
-        pState->mpFont = new Font( maFont );
+        pState->mpFont = new vcl::Font( maFont );
     if ( nFlags & PUSH_TEXTCOLOR )
         pState->mpTextColor = new Color( GetTextColor() );
     if ( nFlags & PUSH_TEXTFILLCOLOR )
@@ -488,10 +488,10 @@ void OutputDevice::SetBackground( const Wallpaper& rBackground )
         mpAlphaVDev->SetBackground( rBackground );
 }
 
-void OutputDevice::SetFont( const Font& rNewFont )
+void OutputDevice::SetFont( const vcl::Font& rNewFont )
 {
 
-    Font aFont( rNewFont );
+    vcl::Font aFont( rNewFont );
     aFont.SetLanguage(rNewFont.GetLanguage());
     if ( mnDrawMode & (DRAWMODE_BLACKTEXT | DRAWMODE_WHITETEXT | DRAWMODE_GRAYTEXT | DRAWMODE_GHOSTEDTEXT | DRAWMODE_SETTINGSTEXT |
                        DRAWMODE_BLACKFILL | DRAWMODE_WHITEFILL | DRAWMODE_GRAYFILL | DRAWMODE_NOFILL |
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 51117fe1c172..93de76c4ef84 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -239,7 +239,7 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout )
     if( !pVDev->SetOutputSizePixel( aBoundRect.GetSize() ) )
         return false;
 
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     aFont.SetOrientation( 0 );
     aFont.SetSize( Size( mpFontEntry->maFontSelData.mnWidth, mpFontEntry->maFontSelData.mnHeight ) );
     pVDev->SetFont( aFont );
@@ -2460,7 +2460,7 @@ bool OutputDevice::GetTextBoundRect( Rectangle& rRect,
     // fall back to bitmap method to get the bounding rectangle,
     // so we need a monochrome virtual device with matching font
     VirtualDevice aVDev( 1 );
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     aFont.SetShadow( false );
     aFont.SetOutline( false );
     aFont.SetRelief( RELIEF_NONE );
@@ -2682,7 +2682,7 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
 
     VirtualDevice aVDev(1);
 
-    Font aFont(GetFont());
+    vcl::Font aFont(GetFont());
     aFont.SetShadow(false);
     aFont.SetOutline(false);
     aFont.SetRelief(RELIEF_NONE);
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index def2f64af08d..1b0f60289f47 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -36,7 +36,7 @@
 #define UNDERLINE_LAST      UNDERLINE_BOLDWAVE
 #define STRIKEOUT_LAST      STRIKEOUT_X
 
-bool OutputDevice::ImplIsUnderlineAbove( const Font& rFont )
+bool OutputDevice::ImplIsUnderlineAbove( const vcl::Font& rFont )
 {
     if ( !rFont.IsVertical() )
         return false;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d38c56bf86c8..b5cd7a57dd85 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2057,7 +2057,7 @@ void MessageDialog::SetMessagesWidths(Window *pParent,
     if (pSecondaryMessage)
     {
         assert(pPrimaryMessage);
-        Font aFont = pParent->GetSettings().GetStyleSettings().GetLabelFont();
+        vcl::Font aFont = pParent->GetSettings().GetStyleSettings().GetLabelFont();
         aFont.SetSize(Size(0, aFont.GetSize().Height() * 1.2));
         aFont.SetWeight(WEIGHT_BOLD);
         pPrimaryMessage->SetControlFont(aFont);
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 9255cc61c279..2da3ed9a0d91 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1021,7 +1021,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
     // put a push action to metafile
     Push();
     // copy graphics state to metafile
-    Font aCopyFont = GetFont();
+    vcl::Font aCopyFont = GetFont();
     if( nOldDPIX != mnDPIX || nOldDPIY != mnDPIY )
     {
         aCopyFont.SetHeight( aCopyFont.GetHeight() * mnDPIY / nOldDPIY );
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 66935d787063..2fabec97ccb2 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -192,7 +192,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
     if ( !bUseSystemFont && !aUserInterfaceFont.isEmpty() )
     {
         StyleSettings aStyleSettings = rSettings.GetStyleSettings();
-        Font aFont = aStyleSettings.GetAppFont();
+        vcl::Font aFont = aStyleSettings.GetAppFont();
         aFont.SetName( aUserInterfaceFont );
         aStyleSettings.SetAppFont( aFont );
         aFont = aStyleSettings.GetHelpFont();
@@ -243,7 +243,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
     if( GetDesktopRectPixel().getHeight() > 600 )
         maxFontheight = (int) ((( 8.0 * (double) GetDesktopRectPixel().getHeight()) / 600.0) + 1.5);
 
-    Font aFont = aStyleSettings.GetMenuFont();
+    vcl::Font aFont = aStyleSettings.GetMenuFont();
     int defFontheight = aFont.GetHeight();
     if( defFontheight > maxFontheight )
         defFontheight = maxFontheight;
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index c19d9e471c19..6425ed4d8a9c 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -168,7 +168,7 @@ void StatusBar::ImplInitSettings( bool bFont,
 
     if ( bFont )
     {
-        Font aFont = rStyleSettings.GetToolFont();
+        vcl::Font aFont = rStyleSettings.GetToolFont();
         if ( IsControlFont() )
             aFont.Merge( GetControlFont() );
         SetZoomedPointFont( aFont );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index a477e304ae16..91059ff9fe5c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1436,7 +1436,7 @@ void ToolBox::ImplInitSettings( bool bFont,
 
     if ( bFont )
     {
-        Font aFont = rStyleSettings.GetToolFont();
+        vcl::Font aFont = rStyleSettings.GetToolFont();
         if ( IsControlFont() )
             aFont.Merge( GetControlFont() );
         SetZoomedPointFont( aFont );
@@ -3008,8 +3008,8 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
     // during configuration mode visible windows will be drawn in a special way
     if ( mbCustomizeMode && pItem->mbShowWindow )
     {
-        Font    aOldFont = GetFont();
-        Color   aOldTextColor = GetTextColor();
+        vcl::Font aOldFont = GetFont();
+        Color     aOldTextColor = GetTextColor();
 
         SetZoomedPointFont( rStyleSettings.GetAppFont() );
         SetLineColor( Color( COL_BLACK ) );
@@ -3160,13 +3160,13 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
         long nTextOffY = nOffY;
 
         // rotate text when vertically docked
-        Font aOldFont = GetFont();
+        vcl::Font aOldFont = GetFont();
         if( pItem->mbVisibleText && !ImplIsFloatingMode() &&
             ((meAlign == WINDOWALIGN_LEFT) || (meAlign == WINDOWALIGN_RIGHT)) )
         {
             bRotate = true;
 
-            Font aRotateFont = aOldFont;
+            vcl::Font aRotateFont = aOldFont;
             aRotateFont.SetOrientation( 2700 );
 
             // center horizontally
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 00d4c8c5598d..da309e446b8a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1237,7 +1237,7 @@ void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags )
     OutputDevice::CopyDeviceArea(aPosAry, nFlags);
 }
 
-bool Window::ImplCheckUIFont( const Font& rFont )
+bool Window::ImplCheckUIFont( const vcl::Font& rFont )
 {
     if( ImplGetSVData()->maGDIData.mbNativeFontConfig )
         return true;
@@ -1403,7 +1403,7 @@ void Window::ImplInitResolutionSettings()
     }
 }
 
-void Window::ImplPointToLogic( Font& rFont ) const
+void Window::ImplPointToLogic( vcl::Font& rFont ) const
 {
     Size    aSize = rFont.GetSize();
     sal_uInt16  nScreenFontZoom = mxSettings->GetStyleSettings().GetScreenFontZoom();
@@ -1428,7 +1428,7 @@ void Window::ImplPointToLogic( Font& rFont ) const
     rFont.SetSize( aSize );
 }
 
-void Window::ImplLogicToPoint( Font& rFont ) const
+void Window::ImplLogicToPoint( vcl::Font& rFont ) const
 {
     Size    aSize = rFont.GetSize();
     sal_uInt16  nScreenFontZoom = mxSettings->GetStyleSettings().GetScreenFontZoom();
@@ -1816,7 +1816,7 @@ void Window::ImplNewInputContext()
     pFocusWin->mpWindowImpl->mpFrameData->maOldInputContext = rInputContext;
 
     SalInputContext         aNewContext;
-    const Font&             rFont = rInputContext.GetFont();
+    const vcl::Font&        rFont = rInputContext.GetFont();
     const OUString&         rFontName = rFont.GetName();
     ImplFontEntry*          pFontEntry = NULL;
     aNewContext.mpFont = NULL;
@@ -2127,7 +2127,7 @@ long Window::CalcTitleWidth() const
         // we guess the width for frame windows as we do not know the
         // border of external dialogs
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-        Font aFont = GetFont();
+        vcl::Font aFont = GetFont();
         ((Window*)this)->SetPointFont( rStyleSettings.GetTitleFont() );
         long nTitleWidth = GetTextWidth( GetText() );
         ((Window*)this)->SetFont( aFont );
@@ -2220,18 +2220,18 @@ void Window::CollectChildren(::std::vector<Window *>& rAllChildren )
     }
 }
 
-void Window::SetPointFont( const Font& rFont )
+void Window::SetPointFont( const vcl::Font& rFont )
 {
 
-    Font aFont = rFont;
+    vcl::Font aFont = rFont;
     ImplPointToLogic( aFont );
     SetFont( aFont );
 }
 
-Font Window::GetPointFont() const
+vcl::Font Window::GetPointFont() const
 {
 
-    Font aFont = GetFont();
+    vcl::Font aFont = GetFont();
     ImplLogicToPoint( aFont );
     return aFont;
 }
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e8126f4afc35..9b42b5763660 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -519,12 +519,12 @@ inline long WinFloatRound( double fVal )
     return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
 }
 
-void Window::SetZoomedPointFont( const Font& rFont )
+void Window::SetZoomedPointFont( const vcl::Font& rFont )
 {
     const Fraction& rZoom = GetZoom();
     if ( rZoom.GetNumerator() != rZoom.GetDenominator() )
     {
-        Font aFont( rFont );
+        vcl::Font aFont( rFont );
         Size aSize = aFont.GetSize();
         double n = (double)aSize.Width();
         n *= (double)rZoom.GetNumerator();
@@ -548,7 +548,7 @@ void Window::SetZoomedPointFont( const Font& rFont )
                 nType = DEFAULTFONT_FIXED;
             else
                 nType = DEFAULTFONT_UI_SANS;
-            Font aTempFont = GetDefaultFont( nType, GetSettings().GetLanguageTag().getLanguageType(), 0 );
+            vcl::Font aTempFont = GetDefaultFont( nType, GetSettings().GetLanguageTag().getLanguageType(), 0 );
             aFont.SetName( aTempFont.GetName() );
             SetPointFont( aFont );
         }
@@ -581,9 +581,9 @@ void Window::SetControlFont()
     }
 }
 
-void Window::SetControlFont( const Font& rFont )
+void Window::SetControlFont( const vcl::Font& rFont )
 {
-    if ( rFont == Font() )
+    if ( rFont == vcl::Font() )
     {
         SetControlFont();
         return;
@@ -596,18 +596,18 @@ void Window::SetControlFont( const Font& rFont )
         *mpWindowImpl->mpControlFont = rFont;
     }
     else
-        mpWindowImpl->mpControlFont = new Font( rFont );
+        mpWindowImpl->mpControlFont = new vcl::Font( rFont );
 
     StateChanged( STATE_CHANGE_CONTROLFONT );
 }
 
-Font Window::GetControlFont() const
+vcl::Font Window::GetControlFont() const
 {
     if ( mpWindowImpl->mpControlFont )
         return *mpWindowImpl->mpControlFont;
     else
     {
-        Font aFont;
+        vcl::Font aFont;
         return aFont;
     }
 }
@@ -692,9 +692,9 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const
     return aSz;
 }
 
-Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
+vcl::Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
 {
-    Font    aFont = GetPointFont();
+    vcl::Font aFont = GetPointFont();
     Size    aFontSize = aFont.GetSize();
     MapMode aPtMapMode( MAP_POINT );
     aFontSize = pDev->LogicToPixel( aFontSize, aPtMapMode );
@@ -1478,7 +1478,7 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
 {
     if (rKey == "weight")
     {
-        Font aFont(GetControlFont());
+        vcl::Font aFont(GetControlFont());
         if (rValue == "thin")
             aFont.SetWeight(WEIGHT_THIN);
         else if (rValue == "ultralight")
@@ -1503,7 +1503,7 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
     }
     else if (rKey == "style")
     {
-        Font aFont(GetControlFont());
+        vcl::Font aFont(GetControlFont());
         if (rValue == "normal")
             aFont.SetItalic(ITALIC_NONE);
         else if (rValue == "oblique")
@@ -1514,13 +1514,13 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
     }
     else if (rKey == "underline" && toBool(rValue) == true)
     {
-        Font aFont(GetControlFont());
+        vcl::Font aFont(GetControlFont());
         aFont.SetUnderline(UNDERLINE_SINGLE);
         SetControlFont(aFont);
     }
     else if (rKey == "size")
     {
-        Font aFont(GetControlFont());
+        vcl::Font aFont(GetControlFont());
         sal_Int32 nHeight = rValue.toInt32() / 1000;
         aFont.SetHeight(nHeight);
         SetControlFont(aFont);
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index de64314bd09d..dd9dc6e0797e 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3954,7 +3954,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     else
         nPointHeight = nPangoHeight/PANGO_SCALE;
 
-    Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
+    vcl::Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
     if( aInfo.m_eWeight != WEIGHT_DONTKNOW )
         aFont.SetWeight( aInfo.m_eWeight );
     if( aInfo.m_eWidth != WIDTH_DONTKNOW )
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 8b26e37d3025..f8490d84dfc1 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -135,7 +135,7 @@ void MyWin::Paint( const Rectangle& rRect )
         DrawLine( Point(r.Left()+i, r.Bottom()), Point(r.Right()-i, r.Top()) );
 
     SetTextColor( Color( COL_WHITE ) );
-    Font aFont( OUString( "Times" ), Size( 0, 25 ) );
+    vcl::Font aFont( OUString( "Times" ), Size( 0, 25 ) );
     SetFont( aFont );
     DrawText( Point( 20, 30 ), OUString( "Just a simple test text" ) );
 }