fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

27 files changed, 102 insertions, 102 deletions

diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index c0b6394ada37..6045211372b7 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -834,7 +834,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground(  ) throw (RuntimeExc
             nColor = mpParent->GetControlForeground().GetColor();
         else
         {
-            Font aFont;
+            vcl::Font aFont;
             if ( mpParent->IsControlFont() )
                 aFont = mpParent->GetControlFont();
             else
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 3b8a988cf0d0..bbe054fbe51e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -154,7 +154,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
     bool bSingleLineMode = false;
     sal_uInt16 nOutlinesCount2d = rOutline2d.Count();
 
-    Font aFont;
+    vcl::Font aFont;
     SvxFontItem& rFontItem = (SvxFontItem&)pCustomShape->GetMergedItem( EE_CHAR_FONTINFO );
     aFont.SetHeight( pCustomShape->GetLogicRect().GetHeight() / rFWData.nMaxParagraphsPerTextArea );
     aFont.SetAlign( ALIGN_TOP );
@@ -242,7 +242,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
             else if ( nScriptType == i18n::ScriptType::ASIAN )
                 nFntItm = EE_CHAR_FONTINFO_CJK;
             SvxFontItem& rFontItem = (SvxFontItem&)pCustomShape->GetMergedItem( nFntItm );
-            Font aFont;
+            vcl::Font aFont;
             aFont.SetHeight( rFWData.nSingleLineHeight );
             aFont.SetAlign( ALIGN_TOP );
 
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index aca2ea65e989..962234304aa4 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -897,7 +897,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
                 case( META_FONT_ACTION ):
                 {
                     MetaFontAction* pAct = (MetaFontAction*) pAction;
-                    Font            aFont( pAct->GetFont() );
+                    vcl::Font       aFont( pAct->GetFont() );
 
                     aCol = aFont.GetColor();
                     TEST_COLS();
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 81c42a16454c..b62da41ebb8e 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -506,7 +506,7 @@ sal_UCS4 SvxShowCharSet::GetSelectCharacter() const
 
 
 
-void SvxShowCharSet::SetFont( const Font& rFont )
+void SvxShowCharSet::SetFont( const vcl::Font& rFont )
 {
     // save last selected unicode
     if( nSelectedIndex >= 0 )
@@ -516,7 +516,7 @@ void SvxShowCharSet::SetFont( const Font& rFont )
     long nSBWidth = aVscrollSB.GetOptimalSize().Width();
     aSize.Width() -= nSBWidth;
 
-    Font aFont = rFont;
+    vcl::Font aFont = rFont;
     aFont.SetWeight( WEIGHT_LIGHT );
     aFont.SetAlign( ALIGN_TOP );
     int nFontHeight = (aSize.Height() - 5) * 2 / (3 * ROW_COUNT);
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 5b270e680b51..ddf6bc8799cd 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -48,7 +48,7 @@ DialControlBmp::DialControlBmp( Window& rParent ) :
     EnableRTL( false );
 }
 
-void DialControlBmp::InitBitmap(const Font& rFont)
+void DialControlBmp::InitBitmap(const vcl::Font& rFont)
 {
     Init();
     SetFont(rFont);
@@ -82,7 +82,7 @@ void DialControlBmp::DrawElements( const OUString& rText, sal_Int32 nAngle )
     if ( !rText.isEmpty() )
     {
         // rotated text
-        Font aFont( GetFont() );
+        vcl::Font aFont( GetFont() );
         aFont.SetColor( GetTextColor() );
         aFont.SetOrientation( static_cast< short >( (nAngle + 5) / 10 ) );  // Font uses 1/10 degrees
         aFont.SetWeight( WEIGHT_BOLD );
@@ -238,7 +238,7 @@ DialControl::DialControl_Impl::DialControl_Impl ( Window& rParent ) :
 {
 }
 
-void DialControl::DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont )
+void DialControl::DialControl_Impl::Init( const Size& rWinSize, const vcl::Font& rWinFont )
 {
     maWinFont = rWinFont;
     maWinFont.SetTransparent(true);
@@ -425,7 +425,7 @@ void DialControl::SetModifyHdl( const Link& rLink )
     mpImpl->maModifyHdl = rLink;
 }
 
-void DialControl::Init( const Size& rWinSize, const Font& rWinFont )
+void DialControl::Init( const Size& rWinSize, const vcl::Font& rWinFont )
 {
     mpImpl->Init( rWinSize, rWinFont );
     EnableRTL( false ); // don't mirror mouse handling
@@ -436,9 +436,9 @@ void DialControl::Init( const Size& rWinSize, const Font& rWinFont )
 void DialControl::Init( const Size& rWinSize )
 {
     //hidpi TODO: GetDefaultFont() picks a font size too small, so fix it here.
-    Font aDefaultSize = GetFont();
+    vcl::Font aDefaultSize = GetFont();
 
-    Font aFont( OutputDevice::GetDefaultFont(
+    vcl::Font aFont( OutputDevice::GetDefaultFont(
         DEFAULTFONT_UI_SANS, Application::GetSettings().GetUILanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ) );
 
     aFont.SetHeight(aDefaultSize.GetHeight());
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 88e101bb4303..02f346a3ee9e 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -83,19 +83,19 @@ using ::com::sun::star::i18n::BreakIterator;
 
 namespace
 {
-    void scaleFontWidth(Font& _rFont,const OutputDevice& rOutDev,long& _n100PercentFont)
+    void scaleFontWidth(vcl::Font& _rFont,const OutputDevice& rOutDev,long& _n100PercentFont)
     {
         _rFont.SetWidth( 0 );
         _n100PercentFont = rOutDev.GetFontMetric( _rFont ).GetWidth();
     }
 
-    void initFont(Font& _rFont)
+    void initFont(vcl::Font& _rFont)
     {
         _rFont.SetTransparent(true);
         _rFont.SetAlign(ALIGN_BASELINE);
     }
 
-    void setFontSize(Font& _rFont)
+    void setFontSize(vcl::Font& _rFont)
     {
         Size aSize( _rFont.GetSize() );
         aSize.Height() = ( aSize.Height() * 3 ) / 5;
@@ -103,7 +103,7 @@ namespace
         _rFont.SetSize( aSize );
     }
 
-    void calcFontHeightAnyAscent(OutputDevice* _pWin,const Font& _rFont,long& _nHeight,long& _nAscent)
+    void calcFontHeightAnyAscent(OutputDevice* _pWin,const vcl::Font& _rFont,long& _nHeight,long& _nAscent)
     {
         if ( !_nHeight )
         {
@@ -364,7 +364,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
 void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
     Point &rPt, const SvxFont &rFont )
 {
-    Font aOldFont = _pPrinter->GetFont();
+    vcl::Font aOldFont = _pPrinter->GetFont();
     sal_uInt16 nScript;
     sal_uInt16 nIdx = 0;
     sal_Int32 nStart = 0;
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 0222e9aafdbe..a951fe8fc6eb 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -35,7 +35,7 @@ SvLBoxFontString::SvLBoxFontString()
 
 SvLBoxFontString::SvLBoxFontString(
         SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rString,
-        const Font& rFont, const Color* pColor ) :
+        const vcl::Font& rFont, const Color* pColor ) :
     SvLBoxString( pEntry, nFlags, rString ),
     maFont( rFont ),
     mbUseColor( pColor != NULL )
@@ -58,8 +58,8 @@ SvLBoxItem* SvLBoxFontString::Create() const
 void SvLBoxFontString::Paint(
     const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry)
 {
-    Font aOldFont( rDev.GetFont() );
-    Font aNewFont( maFont );
+    vcl::Font aOldFont( rDev.GetFont() );
+    vcl::Font aNewFont( maFont );
     bool bSel = pView->IsSelected();
     if( !mbUseColor || bSel )       // selection always gets highlight color
     {
@@ -74,7 +74,7 @@ void SvLBoxFontString::Paint(
 
 void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
 {
-    Font aOldFont( pView->GetFont() );
+    vcl::Font aOldFont( pView->GetFont() );
     pView->Control::SetFont( maFont );
     SvLBoxString::InitViewData( pView, pEntry, pViewData);
     pView->Control::SetFont( aOldFont );
@@ -102,7 +102,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pPar
     return new SvxFontListBox(pParent, nWinStyle);
 }
 
-void SvxFontListBox::InsertFontEntry( const OUString& rString, const Font& rFont, const Color* pColor )
+void SvxFontListBox::InsertFontEntry( const OUString& rString, const vcl::Font& rFont, const Color* pColor )
 {
     mbUseFont = true;           // InitEntry() will use maEntryFont
     maEntryFont = rFont;        // font to use in InitEntry() over InsertEntry()
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index dafd7394bc34..8dea4db44760 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -250,7 +250,7 @@ void SvxPageWindow::DrawPage(const Point& rOrg, const bool bSecond, const bool b
     if(bFrameDirection && !bTable)
     {
         Point aPos;
-        Font aFont(GetFont());
+        vcl::Font aFont(GetFont());
         const Size aSaveSize = aFont.GetSize();
         Size aDrawSize(0,aRect.GetHeight() / 6);
         aFont.SetSize(aDrawSize);
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 0d35871225d0..3dab36e07d46 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -721,7 +721,7 @@ void SvxRubyDialog::UpdateColors( void )
     const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
     svtools::ColorConfig        aColorConfig;
 
-    Font                    aFnt( m_pPreviewWin->GetFont() );
+    vcl::Font               aFnt( m_pPreviewWin->GetFont() );
 
     Color                   aNewTextCol( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
     Color                   aNewFillCol( rStyleSettings.GetWindowColor() );
@@ -769,7 +769,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
 {
     Size aWinSize = GetOutputSize();
 
-    Font aSaveFont = GetFont();
+    vcl::Font aSaveFont = GetFont();
     aSaveFont.SetHeight(aWinSize.Height() / 4);
     SetFont(aSaveFont);
 
@@ -784,7 +784,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
     long nTextHeight = GetTextHeight();
     long nBaseWidth = GetTextWidth(sBaseText);
 
-    Font aRubyFont(aSaveFont);
+    vcl::Font aRubyFont(aSaveFont);
     aRubyFont.SetHeight(aRubyFont.GetHeight() * 70 / 100);
     SetFont(aRubyFont);
     long nRubyWidth = GetTextWidth(sRubyText);
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index de1300c7931d..9a474e15bd98 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -89,10 +89,10 @@ static const sal_Unicode aBulletTypes[] =
     0x2714
 };
 
-static Font& lcl_GetDefaultBulletFont()
+static vcl::Font& lcl_GetDefaultBulletFont()
 {
     static bool bInit = false;
-    static Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
+    static vcl::Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
     if(!bInit)
     {
         aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
@@ -107,7 +107,7 @@ static Font& lcl_GetDefaultBulletFont()
 
 static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
                         const OUString& rBulletChar, const OUString& rText, const OUString& rFontName,
-                        Point& rLeft, Font& rRuleFont, const Font& rTextFont)
+                        Point& rLeft, vcl::Font& rRuleFont, const vcl::Font& rTextFont)
 {
 
     if(NumberingType::CHAR_SPECIAL == nNumberingType )
@@ -151,15 +151,15 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     long nRectHeight = aRect.GetHeight();
     Size aRectSize(nRectWidth, aRect.GetHeight());
     Point aBLPos = aRect.TopLeft();
-    Font aOldFont = pDev->GetFont();
+    vcl::Font aOldFont = pDev->GetFont();
     Color aOldColor = pDev->GetLineColor();
     pDev->SetLineColor(aTextColor);
-    Font aFont(OutputDevice::GetDefaultFont(
+    vcl::Font aFont(OutputDevice::GetDefaultFont(
                 DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
 
     Size aSize = aFont.GetSize();
 
-    Font aRuleFont( lcl_GetDefaultBulletFont() );
+    vcl::Font aRuleFont( lcl_GetDefaultBulletFont() );
     aSize.Height() = nRectHeight/6;
     aRuleFont.SetSize(aSize);
     aRuleFont.SetColor(aTextColor);
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index a4c746116893..6eb6e1b3f190 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -162,7 +162,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
 
     if (nAnchor == TextContentAnchorType_AS_CHARACTER || nAnchor == TextContentAnchorType_AT_CHARACTER)
     {
-        Font aFont = OutputDevice::GetDefaultFont(
+        vcl::Font aFont = OutputDevice::GetDefaultFont(
                                 DEFAULTFONT_LATIN_TEXT, Application::GetSettings().GetLanguageTag().getLanguageType(),
                                 DEFAULTFONT_FLAGS_ONLYONE, this );
         aFont.SetColor( m_aTxtCol );
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index f519b46cf0e3..d452b5ce9f45 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -78,7 +78,7 @@ using ::com::sun::star::awt::XVclWindowPeer;
 
 
 
-::com::sun::star::awt::FontDescriptor ImplCreateFontDescriptor( const Font& rFont )
+::com::sun::star::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont )
 {
     ::com::sun::star::awt::FontDescriptor aFD;
     aFD.Name = rFont.GetName();
@@ -101,9 +101,9 @@ using ::com::sun::star::awt::XVclWindowPeer;
 }
 
 
-Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr )
+vcl::Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr )
 {
-    Font aFont;
+    vcl::Font aFont;
     aFont.SetName( rDescr.Name );
     aFont.SetStyleName( rDescr.StyleName );
     aFont.SetSize( ::Size( rDescr.Width, rDescr.Height ) );
@@ -1880,14 +1880,14 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t
     }
     else if ( PropertyName == FM_PROP_FONTEMPHASISMARK )
     {
-        Font aGridFont = pGrid->GetControlFont();
+        vcl::Font aGridFont = pGrid->GetControlFont();
         sal_Int16 nValue = ::comphelper::getINT16(Value);
         aGridFont.SetEmphasisMark( nValue );
         pGrid->SetControlFont( aGridFont );
     }
     else if ( PropertyName == FM_PROP_FONTRELIEF )
     {
-        Font aGridFont = pGrid->GetControlFont();
+        vcl::Font aGridFont = pGrid->GetControlFont();
         sal_Int16 nValue = ::comphelper::getINT16(Value);
         aGridFont.SetRelief( (FontRelief)nValue );
         pGrid->SetControlFont( aGridFont );
@@ -1923,18 +1923,18 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t
     else if ( PropertyName == FM_PROP_FONT )
     {
         if ( bVoid )
-            pGrid->SetControlFont( Font() );
+            pGrid->SetControlFont( vcl::Font() );
         else
         {
             ::com::sun::star::awt::FontDescriptor aFont;
             if (Value >>= aFont)
             {
-                Font aNewVclFont;
+                vcl::Font aNewVclFont;
                 if (::comphelper::operator!=(aFont, ::comphelper::getDefaultFont()))    // ist das der Default
                     aNewVclFont = ImplCreateFont( aFont );
 
                 // need to add relief and emphasis (they're stored in a VCL-Font, but not in a FontDescriptor
-                Font aOldVclFont = pGrid->GetControlFont();
+                vcl::Font aOldVclFont = pGrid->GetControlFont();
                 aNewVclFont.SetRelief( aOldVclFont.GetRelief() );
                 aNewVclFont.SetEmphasisMark( aOldVclFont.GetEmphasisMark() );
 
@@ -2061,7 +2061,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc
 
         if ( _rPropertyName == FM_PROP_NAME )
         {
-            Font aFont = pDataWindow->GetControlFont();
+            vcl::Font aFont = pDataWindow->GetControlFont();
             aProp <<= ImplCreateFontDescriptor( aFont );
         }
         else if ( _rPropertyName == FM_PROP_TEXTCOLOR )
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 4f3914026820..fdc23002211f 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -745,7 +745,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni
             pWindows[i]->SetZoom( rParent.GetZoom() );
 
             const StyleSettings& rStyleSettings = pWindows[i]->GetSettings().GetStyleSettings();
-            Font aFont = rStyleSettings.GetFieldFont();
+            vcl::Font aFont = rStyleSettings.GetFieldFont();
             aFont.SetTransparent( isTransparent() );
 
             if ( rParent.IsControlFont() )
@@ -978,7 +978,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
         m_pPainter->SetTextColor( _rDev.GetTextColor() );
         m_pPainter->SetTextFillColor( _rDev.GetTextColor() );
 
-        Font aFont( _rDev.GetFont() );
+        vcl::Font aFont( _rDev.GetFont() );
         aFont.SetTransparent( true );
         m_pPainter->SetFont( aFont );
 
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index bbe947224c58..5939b8823094 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -420,7 +420,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
     // Is the font of this edit larger than the field?
     if (m_aAbsolute.GetTextHeight() > nH)
     {
-        Font aApplFont (m_aAbsolute.GetFont());
+        vcl::Font aApplFont (m_aAbsolute.GetFont());
         const Size pointAbsoluteSize(m_aAbsolute.PixelToLogic( Size( 0, nH - 2 ), MapMode(MAP_POINT) ));
         aApplFont.SetSize( pointAbsoluteSize );
         m_aAbsolute.SetControlFont( aApplFont );
@@ -735,7 +735,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
             Fraction aZoom = GetZoom();
 
             // not all of these controls need to know the new zoom, but to be sure ...
-            Font aFont( GetSettings().GetStyleSettings().GetFieldFont() );
+            vcl::Font aFont( GetSettings().GetStyleSettings().GetFieldFont() );
             if ( IsControlFont() )
                 aFont.Merge( GetControlFont() );
 
@@ -1038,7 +1038,7 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet _eInitWhat )
     {
         if ( m_bNavigationBar )
         {
-            Font aFont = m_aBar.GetSettings().GetStyleSettings().GetFieldFont();
+            vcl::Font aFont = m_aBar.GetSettings().GetStyleSettings().GetFieldFont();
             if ( IsControlFont() )
                 m_aBar.SetControlFont( GetControlFont() );
             else
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index ea6fa56e03c9..c3117a96c2a1 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1089,8 +1089,8 @@ void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
 
-    Font aOldFont( pView->GetFont());
-    Font aFont( aOldFont );
+    vcl::Font aOldFont( pView->GetFont());
+    vcl::Font aFont( aOldFont );
     aFont.SetWeight(WEIGHT_BOLD);
     pView->Control::SetFont( aFont );
 
@@ -1104,8 +1104,8 @@ void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
 void FmFilterString::Paint(
     const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
 {
-    Font aOldFont( rDev.GetFont());
-    Font aFont( aOldFont );
+    vcl::Font aOldFont( rDev.GetFont());
+    vcl::Font aFont( aOldFont );
     aFont.SetWeight(WEIGHT_BOLD);
     rDev.SetFont( aFont );
 
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 7280b8178a48..dc76c80e8d57 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -176,7 +176,7 @@ namespace svxform
                 }
 
                 // retrieve a default font for this locale, and set it at the control
-                Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag::convertToLanguageType( aDocumentCharLocale ), DEFAULTFONT_FLAGS_ONLYONE );
+                vcl::Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag::convertToLanguageType( aDocumentCharLocale ), DEFAULTFONT_FLAGS_ONLYONE );
                 FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont );
                 _rxModel->setPropertyValue(
                     OUString( "FontDescriptor" ),
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 0e6577cd081c..c70f39ed5134 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -438,7 +438,7 @@ GalleryBrowser2::GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery*
 
     Image       aDummyImage;
     const Link  aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
-    Font        aInfoFont( maInfoBar.GetControlFont() );
+    vcl::Font   aInfoFont( maInfoBar.GetControlFont() );
 
     maMiscOptions.AddListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
 
@@ -491,7 +491,7 @@ GalleryBrowser2::~GalleryBrowser2()
 
 void GalleryBrowser2::InitSettings()
 {
-    Font  aInfoFont( maInfoBar.GetControlFont() );
+    vcl::Font  aInfoFont( maInfoBar.GetControlFont() );
 
     aInfoFont.SetWeight( WEIGHT_BOLD );
     aInfoFont.SetColor( GALLERY_FG_COLOR );
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx
index 66f83a2f151a..eb9ee9300f12 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -109,11 +109,11 @@ void  LineWidthValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     //const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     //Color aBackColor(0,0,200);
     //const Color aTextColor = rStyleSettings.GetFieldTextColor();
-    Font aOldFont = pDev->GetFont();
+    vcl::Font aOldFont = pDev->GetFont();
     Color aOldColor = pDev->GetLineColor();
     Color aOldFillColor = pDev->GetFillColor();
 
-    Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
+    vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
     Size aSize = aFont.GetSize();
     aSize.Height() = nRectHeight*3/5;
     aFont.SetSize( aSize );
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 37c274e630be..d52be9e1ee2e 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -64,10 +64,10 @@ using namespace com::sun::star::style;
 namespace svx { namespace sidebar {
 #define MAX_VALUESET_GRAPHIC    30
 
-Font& lcl_GetDefaultBulletFont()
+vcl::Font& lcl_GetDefaultBulletFont()
 {
     static bool bInit = false;
-    static Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
+    static vcl::Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
     if(!bInit)
     {
         aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
@@ -187,7 +187,7 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename)
                 {
                     SvxNumberFormat aFmt(aNum.GetLevel(i));
                     if (aFmt.GetBulletFont()) {
-                        Font aFont(*aFmt.GetBulletFont());
+                        vcl::Font aFont(*aFmt.GetBulletFont());
                         Color c=aFont.GetColor();
                         c.SetTransparency(0xFF);
                         aFont.SetColor(c);
@@ -283,7 +283,7 @@ BulletsTypeMgr& BulletsTypeMgr::GetInstance()
 
 void BulletsTypeMgr::Init()
 {
-    Font& rActBulletFont = lcl_GetDefaultBulletFont();
+    vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
 
     if( Application::GetSettings().GetLayoutRTL() )
     {
@@ -321,7 +321,7 @@ sal_uInt16 BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe
 
     SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
     sal_Unicode cChar = aFmt.GetBulletChar();
-    //const Font* pFont = aFmt.GetBulletFont();
+    //const vcl::Font* pFont = aFmt.GetBulletFont();
     //sal_uInt16 nLength = 0;
     /*if( Application::GetSettings().GetLayoutRTL() )
     {
@@ -377,7 +377,7 @@ bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
 
     SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
     sal_Unicode cChar = aFmt.GetBulletChar();
-    const Font* pFont = aFmt.GetBulletFont();
+    const vcl::Font* pFont = aFmt.GetBulletFont();
     //sal_uInt16 nLength = 0;
     /*if( Application::GetSettings().GetLayoutRTL() )
     {
@@ -442,8 +442,8 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
     if ( nIndex >= DEFAULT_BULLET_TYPES )
         return false;
     cChar = pActualBullets[nIndex]->cBulletChar;
-    //Font& rActBulletFont = lcl_GetDefaultBulletFont();
-    Font rActBulletFont = pActualBullets[nIndex]->aFont;
+    //vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+    vcl::Font rActBulletFont = pActualBullets[nIndex]->aFont;
 
     sal_uInt16 nMask = 1;
     OUString sBulletCharFmtName = GetBulCharFmtName();
@@ -524,9 +524,9 @@ sal_Unicode BulletsTypeMgr::GetBulChar(sal_uInt16 nIndex)
 
     return cChar;
 }
-Font BulletsTypeMgr::GetBulCharFont(sal_uInt16 nIndex)
+vcl::Font BulletsTypeMgr::GetBulCharFont(sal_uInt16 nIndex)
 {
-    Font aRet;
+    vcl::Font aRet;
     if ( nIndex >= DEFAULT_BULLET_TYPES )
         aRet = lcl_GetDefaultBulletFont();
     else
@@ -960,7 +960,7 @@ sal_uInt16 MixBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
     if( eNumType == SVX_NUM_CHAR_SPECIAL)
     {
         sal_Unicode cChar = aFmt.GetBulletChar();
-        // const Font* pFont = aFmt.GetBulletFont();
+        // const vcl::Font* pFont = aFmt.GetBulletFont();
 
         for(sal_uInt16 i = nFromIndex; i < DEFAULT_BULLET_TYPES; i++)
         {
@@ -1031,7 +1031,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u
     if( eNumType == SVX_NUM_CHAR_SPECIAL && pActualBullets[nIndex]->eType == eNBType::BULLETS )
     {
         sal_Unicode cChar = aFmt.GetBulletChar();
-        const Font* pFont = aFmt.GetBulletFont();
+        const vcl::Font* pFont = aFmt.GetBulletFont();
         BulletsSettings_Impl* pEntry = (BulletsSettings_Impl*) (pActualBullets[nIndex]->pBullets);
         pEntry->cBulletChar = cChar;
         pEntry->aFont = pFont?*pFont:lcl_GetDefaultBulletFont();
@@ -1083,7 +1083,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u
         if ( eNumType == SVX_NUM_CHAR_SPECIAL )
         {
             sal_Unicode cChar = aFmt.GetBulletChar();
-            const Font* pFont = aFmt.GetBulletFont();
+            const vcl::Font* pFont = aFmt.GetBulletFont();
             pActualBullets[nIndex]->eType = eNBType::BULLETS;
             pActualBullets[nIndex]->nIndex = nIndex+1; //index in the tab page display,decrease 1 to the index within arr
             pActualBullets[nIndex]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ;
@@ -1167,8 +1167,8 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
         sal_Unicode cChar;
         cChar = ((BulletsSettings_Impl*)(pCurrentBullets->pBullets))->cBulletChar;
 
-        //Font& rActBulletFont = lcl_GetDefaultBulletFont();
-        Font rActBulletFont = ((BulletsSettings_Impl*)(pCurrentBullets->pBullets))->aFont;
+        //vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+        vcl::Font rActBulletFont = ((BulletsSettings_Impl*)(pCurrentBullets->pBullets))->aFont;
         sal_uInt16 nMask = 1;
         OUString sBulletCharFmtName = GetBulCharFmtName();
         for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
@@ -1585,7 +1585,7 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
                 if( eNumType == SVX_NUM_CHAR_SPECIAL)
             {
                 sal_Unicode cChar = aFmt.GetBulletChar();
-                //const Font* pFont = aFmt.GetBulletFont();
+                //const vcl::Font* pFont = aFmt.GetBulletFont();
                 sal_Unicode ccChar = _pSet->sBulletChar[0];
                 // rtl::OUString sFont = _pSet->sBulletFont;
                 if ( !((cChar == ccChar) && //pFont && sFont.compareTo(pFont->GetName()) &&
@@ -1741,7 +1741,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
 
         SvxNumberFormat aFmt(aNum.GetLevel(i));
         //aFmt.SetBulletFont(&pLevelSettings->aFont);
-        Font& rActBulletFont = lcl_GetDefaultBulletFont();
+        vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
         if (pLevelSettings->nNumberType !=aFmt.GetNumberingType()) isResetSize=true;
         aFmt.SetNumberingType( pLevelSettings->nNumberType );
         sal_uInt16 nUpperLevelOrChar = (sal_uInt16)pLevelSettings->nParentNumbering;
@@ -1760,13 +1760,13 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
                 if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
                 {
                     vcl::FontInfo aInfo = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
-                    Font aFont(aInfo);
+                    vcl::Font aFont(aInfo);
                     aFmt.SetBulletFont(&aFont);
                 }
                 else
                 {
                     //if it cannot be found then create a new one
-                    Font aCreateFont( pLevelSettings->sBulletFont, OUString(), Size( 0, 14 ) );
+                    vcl::Font aCreateFont( pLevelSettings->sBulletFont, OUString(), Size( 0, 14 ) );
                     aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
                     aCreateFont.SetFamily( FAMILY_DONTKNOW );
                     aCreateFont.SetPitch( PITCH_DONTKNOW );
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 17638b111f49..793fc4fd0ba1 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -51,10 +51,10 @@ using namespace com::sun::star::style;
 
 namespace svx { namespace sidebar {
 
-static Font& lcl_GetDefaultBulletFont()
+static vcl::Font& lcl_GetDefaultBulletFont()
 {
     static bool bInit = false;
-    static Font aDefBulletFont( OUString( "StarSymbol" ),
+    static vcl::Font aDefBulletFont( OUString( "StarSymbol" ),
                                 OUString(), Size( 0, 14 ) );
     if(!bInit)
     {
@@ -197,7 +197,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt )
     const long nRectHeight = aRect.GetHeight();
     const Point aBLPos = aRect.TopLeft();
 
-    Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
+    vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
     {
         Size aSize = aFont.GetSize();
         aSize.Height() = (nRectHeight*4)/9;
@@ -325,10 +325,10 @@ void  SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt )
     long nRectHeight = aRect.GetHeight();
     Size aRectSize(nRectWidth, aRect.GetHeight());
     Point aBLPos = aRect.TopLeft();
-    Font aOldFont = pDev->GetFont();
+    vcl::Font aOldFont = pDev->GetFont();
     Color aOldColor = pDev->GetLineColor();
     pDev->SetLineColor(aBackColor);
-    Font aFont(OutputDevice::GetDefaultFont(
+    vcl::Font aFont(OutputDevice::GetDefaultFont(
                 DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
 
     Size aSize = aFont.GetSize();
@@ -378,7 +378,7 @@ void  SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt )
     if ( nItemId == DEFAULT_NONE)
     {
         OUString sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE));
-        Font aLclFont = pDev->GetFont();
+        vcl::Font aLclFont = pDev->GetFont();
         Size aLclSize = aLclFont.GetSize();
         aLclSize.Height() = nRectHeight/4;
         aLclFont.SetSize( aLclSize );
@@ -462,8 +462,8 @@ void  SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt )
                 const Color aBackColor = rStyleSettings.GetFieldColor();
                 const Color aTextColor = rStyleSettings.GetFieldTextColor();
 
-                Font aOldFont = pDev->GetFont();
-                Font aFont( lcl_GetDefaultBulletFont() );
+                vcl::Font aOldFont = pDev->GetFont();
+                vcl::Font aFont( lcl_GetDefaultBulletFont() );
 
                 Size aSize = aFont.GetSize();
                 aSize.Height() = nRectHeight*3/6;
@@ -474,8 +474,8 @@ void  SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt )
                 pDev->SetFillColor( aBackColor ); //wj
 
                 OUString sText(cChar);
-                Font aOldBulletFont = pDev->GetFont();
-                Font aBulletFnt(aFmt.GetBulletFont() ? *aFmt.GetBulletFont() : aOldBulletFont);
+                vcl::Font aOldBulletFont = pDev->GetFont();
+                vcl::Font aBulletFnt(aFmt.GetBulletFont() ? *aFmt.GetBulletFont() : aOldBulletFont);
                 Size aBulSize = aOldBulletFont.GetSize();
                 aBulletFnt.SetSize(aBulSize);
                 pDev->SetFont(aBulletFnt);
@@ -505,8 +505,8 @@ void  SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt )
             const Color aBackColor = rStyleSettings.GetFieldColor();
             const Color aTextColor = rStyleSettings.GetFieldTextColor();
 
-            Font aOldFont = pDev->GetFont();
-            Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
+            vcl::Font aOldFont = pDev->GetFont();
+            vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
             Size aSize = aFont.GetSize();
             //aSize.Height() = nRectHeight/5;
             aSize.Height() = nRectHeight/4;
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 2da6c1b55238..c98757922408 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -407,7 +407,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
 
     if(bText && mbFntDirty)
     {
-        Font aFnt(maVD.GetFont());
+        vcl::Font aFnt(maVD.GetFont());
         const sal_uInt32 nHeight(FRound(aFnt.GetSize().Height() * mfScaleY));
 
         mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO ) );
@@ -993,7 +993,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
     // calc text box size, add 5% to make it fit safely
 
     FontMetric aFontMetric( maVD.GetFontMetric() );
-    Font aFnt( maVD.GetFont() );
+    vcl::Font aFnt( maVD.GetFont() );
     FontAlign eAlg( aFnt.GetAlign() );
 
     sal_Int32 nTextWidth = (sal_Int32)( maVD.GetTextWidth( rStr ) * mfScaleX );
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 18f354a0f240..bb0041645e9c 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -500,7 +500,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos)
         pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize());
         pEditControl->SetText(pEntry->aValue);
         pEditControl->SetBackground( Wallpaper(Color(COL_LIGHTGRAY)));
-        Font aFont(pEditControl->GetFont());
+        vcl::Font aFont(pEditControl->GetFont());
         aFont.SetFillColor(Color(COL_LIGHTGRAY));
         pEditControl->SetFont(aFont);
         pEditControl->Show();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ce465ce52fe0..c197fa7f0dd4 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -727,7 +727,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     sal_uInt16 nLanguage(Application::GetSettings().GetLanguageTag().getLanguageType());
 
     // get DEFAULTFONT_LATIN_TEXT and set at pool as dynamic default
-    Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
+    vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
     aSvxFontItem.SetFamily(aFont.GetFamily());
     aSvxFontItem.SetFamilyName(aFont.GetName());
     aSvxFontItem.SetStyleName(OUString());
@@ -736,7 +736,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     pItemPool->SetPoolDefaultItem(aSvxFontItem);
 
     // get DEFAULTFONT_CJK_TEXT and set at pool as dynamic default
-    Font aFontCJK(OutputDevice::GetDefaultFont(DEFAULTFONT_CJK_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
+    vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DEFAULTFONT_CJK_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
     aSvxFontItemCJK.SetFamily( aFontCJK.GetFamily());
     aSvxFontItemCJK.SetFamilyName(aFontCJK.GetName());
     aSvxFontItemCJK.SetStyleName(OUString());
@@ -745,7 +745,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     pItemPool->SetPoolDefaultItem(aSvxFontItemCJK);
 
     // get DEFAULTFONT_CTL_TEXT and set at pool as dynamic default
-    Font aFontCTL(OutputDevice::GetDefaultFont(DEFAULTFONT_CTL_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
+    vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DEFAULTFONT_CTL_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
     aSvxFontItemCTL.SetFamily(aFontCTL.GetFamily());
     aSvxFontItemCTL.SetFamilyName(aFontCTL.GetName());
     aSvxFontItemCTL.SetStyleName(OUString());
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index d74d9b0fec77..011418d57844 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -888,8 +888,8 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
         if(pMtf)
             pMtf->Pause(true);
 
-        Font aFontMerk(pOut->GetFont());
-        Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) );
+        vcl::Font aFontMerk(pOut->GetFont());
+        vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) );
 
         aTmpFont.SetSize(Size(0,100));
         pOut->SetFont(aTmpFont);
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 8d8fd4953749..aefba0c905fc 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -97,7 +97,7 @@ namespace
         DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo* );
         DECL_LINK(decomposeStretchBulletPrimitive, DrawBulletInfo* );
 
-        bool impIsUnderlineAbove(const Font& rFont) const;
+        bool impIsUnderlineAbove(const vcl::Font& rFont) const;
         void impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo);
         drawinglayer::primitive2d::BasePrimitive2D* impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo) const;
         void impFlushTextPortionPrimitivesToLinePrimitives();
@@ -159,7 +159,7 @@ namespace
         drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence();
     };
 
-    bool impTextBreakupHandler::impIsUnderlineAbove(const Font& rFont) const
+    bool impTextBreakupHandler::impIsUnderlineAbove(const vcl::Font& rFont) const
     {
         if(!rFont.IsVertical())
         {
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 4917f107f4e1..2794af2f80ca 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -135,7 +135,7 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri
     aBackgroundColor = GetSettings().GetStyleSettings().GetFaceColor();
 
     SetBackground( aBackgroundColor );
-    Font aFont = GetFont();
+    vcl::Font aFont = GetFont();
     aFont.SetColor( ::Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor )  );
     aFont.SetFillColor( aBackgroundColor );
     aFont.SetTransparent( false );
@@ -447,7 +447,7 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUStri
 
     nTextHeight = GetTextHeight()+1;
     SetBackground();
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     aFont.SetColor( aLineColor );
     aFont.SetFillColor( aFaceColor );
     aFont.SetTransparent( false );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 1afb936d49f6..f6f189c58708 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -163,7 +163,7 @@ private:
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<FontList>      m_aOwnFontList;
     SAL_WNODEPRECATED_DECLARATIONS_POP
-    Font                           aCurFont;
+    vcl::Font                      aCurFont;
     Size                           aLogicalSize;
     OUString                       aCurText;
     sal_uInt16                     nFtCount;
@@ -591,7 +591,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
                     aFont.SetEmphasisMark( static_cast< const SvxEmphasisMarkItem* >( pItem )->GetEmphasisMark() );
 
                 // setup the device & draw
-                Font aOldFont( pDevice->GetFont() );
+                vcl::Font aOldFont( pDevice->GetFont() );
                 Color aOldColor( pDevice->GetTextColor() );
                 Color aOldFillColor( pDevice->GetFillColor() );
 
@@ -768,7 +768,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent*, event
     OUString fontname = GetSubEdit()->GetText();
     lcl_GetDocFontList( &pFontList, this );
     // If the font is unknown, show it in italic.
-    Font font = GetControlFont();
+    vcl::Font font = GetControlFont();
     if( pFontList != NULL && pFontList->IsAvailable( fontname ))
     {
         if( font.GetItalic() != ITALIC_NONE )