fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

16 files changed, 65 insertions, 65 deletions

diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index be09cce60c51..d8a0f731988b 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -47,7 +47,7 @@ SpellErrorAttrib::~SpellErrorAttrib()
 }
 
 
-void SpellErrorAttrib::SetFont( Font&  ) const
+void SpellErrorAttrib::SetFont( vcl::Font&  ) const
 {
     //this attribute doesn't have a visual effect
 }
@@ -85,7 +85,7 @@ SpellLanguageAttrib::~SpellLanguageAttrib()
 }
 
 
-void SpellLanguageAttrib::SetFont( Font&  ) const
+void SpellLanguageAttrib::SetFont( vcl::Font&  ) const
 {
     //no visual effect
 }
@@ -123,7 +123,7 @@ SpellBackgroundAttrib::~SpellBackgroundAttrib()
 }
 
 
-void SpellBackgroundAttrib::SetFont( Font& rFont ) const
+void SpellBackgroundAttrib::SetFont( vcl::Font& rFont ) const
 {
     rFont.SetFillColor(m_aBackgroundColor);
 }
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index f0a53f38b0b6..d50b851805e4 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -112,7 +112,7 @@ public:
     const SpellErrorDescription& GetErrorDescription() const { return m_aSpellErrorDescription; }
 
 
-    virtual void            SetFont( Font& rFont ) const SAL_OVERRIDE;
+    virtual void            SetFont( vcl::Font& rFont ) const SAL_OVERRIDE;
     virtual TextAttrib*     Clone() const SAL_OVERRIDE;
     virtual bool            operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE;
 };
@@ -135,7 +135,7 @@ public:
                                         {m_eLanguage = eLang;}
 
 
-    virtual void            SetFont( Font& rFont ) const SAL_OVERRIDE;
+    virtual void            SetFont( vcl::Font& rFont ) const SAL_OVERRIDE;
     virtual TextAttrib*     Clone() const SAL_OVERRIDE;
     virtual bool            operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE;
 };
@@ -157,7 +157,7 @@ public:
     void                    SetColor( const Color& rNewCol ){m_aBackgroundColor = rNewCol;}
 
 
-    virtual void            SetFont( Font& rFont ) const SAL_OVERRIDE;
+    virtual void            SetFont( vcl::Font& rFont ) const SAL_OVERRIDE;
     virtual TextAttrib*     Clone() const SAL_OVERRIDE;
     virtual bool            operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE;
 };
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 06a99138bb10..8236ebacc06a 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -144,8 +144,8 @@ void AboutDialog::StyleControls()
     m_pDescriptionText->SetPaintTransparent(true);
     m_pCopyrightText->SetPaintTransparent(true);
 
-    Font aLabelFont = GetSettings().GetStyleSettings().GetLabelFont();
-    Font aLargeFont = aLabelFont;
+    vcl::Font aLabelFont = GetSettings().GetStyleSettings().GetLabelFont();
+    vcl::Font aLargeFont = aLabelFont;
     aLargeFont.SetSize( Size( 0, aLabelFont.GetSize().Height() * 3 ) );
 
     // Logo Replacement Text
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index df37c79c11af..81ad04832245 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -88,14 +88,14 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, bool bOne_, const SfxItemSet*
     SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, false );
     if ( pFontItem )
     {
-        Font aTmpFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), GetCharFont().GetSize() );
+        vcl::Font aTmpFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), GetCharFont().GetSize() );
         aTmpFont.SetCharSet( pFontItem->GetCharSet() );
         aTmpFont.SetPitch( pFontItem->GetPitch() );
         SetCharFont( aTmpFont );
     }
     else if ( pFontNameItem )
     {
-        Font aTmpFont( GetCharFont() );
+        vcl::Font aTmpFont( GetCharFont() );
         aTmpFont.SetName( pFontNameItem->GetValue() );
         SetCharFont( aTmpFont );
     }
@@ -151,7 +151,7 @@ short SvxCharacterMap::Execute()
         if ( pSet )
         {
             const SfxItemPool* pPool = pSet->GetPool();
-            const Font& rFont( GetCharFont() );
+            const vcl::Font& rFont( GetCharFont() );
             pSet->Put( SfxStringItem( pPool->GetWhich(SID_CHARMAP), GetCharacters() ) );
             pSet->Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(),
                 rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
@@ -195,7 +195,7 @@ void SvxShowText::Paint( const Rectangle& )
 
     bool bGotBoundary = true;
     bool bShrankFont = false;
-    Font aOrigFont(GetFont());
+    vcl::Font aOrigFont(GetFont());
     Size aFontSize(aOrigFont.GetSize());
     Rectangle aBoundRect;
 
@@ -212,7 +212,7 @@ void SvxShowText::Paint( const Rectangle& )
         long nTextWidth = aBoundRect.GetWidth();
         if (nAvailWidth > nTextWidth)
             break;
-        Font aFont(aOrigFont);
+        vcl::Font aFont(aOrigFont);
         aFontSize.Height() = nFontHeight;
         aFont.SetSize(aFontSize);
         Control::SetFont(aFont);
@@ -263,10 +263,10 @@ void SvxShowText::Paint( const Rectangle& )
 
 
 
-void SvxShowText::SetFont( const Font& rFont )
+void SvxShowText::SetFont( const vcl::Font& rFont )
 {
     long nWinHeight = GetOutputSizePixel().Height();
-    Font aFont = rFont;
+    vcl::Font aFont = rFont;
     aFont.SetWeight( WEIGHT_NORMAL );
     aFont.SetAlign( ALIGN_TOP );
     aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) );
@@ -279,7 +279,7 @@ void SvxShowText::SetFont( const Font& rFont )
 
 Size SvxShowText::GetOptimalSize() const
 {
-    const Font &rFont = GetFont();
+    const vcl::Font &rFont = GetFont();
     const Size rFontSize = rFont.GetSize();
     long nWinHeight = LogicToPixel(rFontSize).Height() * 2;
     return Size( GetTextWidth( GetText() ) + 2 * 12, nWinHeight );
@@ -379,11 +379,11 @@ void SvxCharacterMap::init()
 
 
 
-void SvxCharacterMap::SetCharFont( const Font& rFont )
+void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
 {
     // first get the underlying info in order to get font names
     // like "Times New Roman;Times" resolved
-    Font aTmp( GetFontMetric( rFont ) );
+    vcl::Font aTmp( GetFontMetric( rFont ) );
 
     if ( m_pFontLB->GetEntryPos( aTmp.GetName() ) == LISTBOX_ENTRY_NOTFOUND )
         return;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 99a5b1f7b75b..791bb7d340de 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -61,7 +61,7 @@ namespace svx
             OutputDevice& m_rDev;
 
         public:
-            inline FontSwitch( OutputDevice& _rDev, const Font& _rTemporaryFont )
+            inline FontSwitch( OutputDevice& _rDev, const vcl::Font& _rTemporaryFont )
                 :m_rDev( _rDev )
             {
                 m_rDev.Push( PUSH_FONT );
@@ -127,7 +127,7 @@ namespace svx
         Size aPlaygroundSize( _rRect.GetSize() );
 
         // the font for the secondary text:
-        Font aSmallerFont( _rDevice.GetFont() );
+        vcl::Font aSmallerFont( _rDevice.GetFont() );
         // heuristic: 80% of the original size
         aSmallerFont.SetHeight( (long)( 0.8 * aSmallerFont.GetHeight() ) );
 
@@ -304,7 +304,7 @@ namespace svx
 
     Size RubyRadioButton::GetOptimalSize() const
     {
-        Font aSmallerFont( GetFont() );
+        vcl::Font aSmallerFont( GetFont() );
         aSmallerFont.SetHeight( static_cast<long>( 0.8 * aSmallerFont.GetHeight() ) );
         Rectangle rect( Point(), Size( SAL_MAX_INT32, SAL_MAX_INT32 ) );
         sal_uInt16 style = GetStyle();
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 2566f9b66e8b..bf2d6a33f3bd 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -57,7 +57,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
     m_pAuthorBtn->SetClickHdl( LINK( this, SvxPostItDialog, Stamp ) );
     m_pOKBtn->SetClickHdl( LINK( this, SvxPostItDialog, OKHdl ) );
 
-    Font aFont( m_pEditED->GetFont() );
+    vcl::Font aFont( m_pEditED->GetFont() );
     aFont.SetWeight( WEIGHT_LIGHT );
     m_pEditED->SetFont( aFont );
 
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index d9d6ec7682aa..abd225bb3f7b 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -145,10 +145,10 @@ void AlternativesString::Paint(
 {
     AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry );
     Point aPos( rPos );
-    Font aOldFont( rDev.GetFont());
+    vcl::Font aOldFont( rDev.GetFont());
     if (pData && pData->IsHeader())
     {
-        Font aFont( aOldFont );
+        vcl::Font aFont( aOldFont );
         aFont.SetWeight( WEIGHT_BOLD );
         rDev.SetFont( aFont );
         aPos.X() = 0;
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index 80d25ee33022..cff22986fc77 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -25,7 +25,7 @@
 // caution: needs C-Linkage since dynamically loaded via symbol name
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const Font& i_rFont, OUString& o_rResult)
+SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rResult)
 {
     bool bRet = false;
     boost::scoped_ptr<SvxCharacterMap> aDlg(new SvxCharacterMap( i_pParent ));
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index eb3ea5b9cc95..5d70cc9d9fea 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -154,9 +154,9 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     OUString        sBulletChar;
     OUString        sByInputBulletChar;
 
-    Font            aBulletFont;
-    Font            aByInputBulletFont;
-    sal_uInt16          nPercent;
+    vcl::Font        aBulletFont;
+    vcl::Font        aByInputBulletFont;
+    sal_uInt16       nPercent;
 
     SvLBoxButtonData*   pCheckButtonData;
 
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 8af1b917362e..0c982672ce74 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -43,7 +43,7 @@ public:
                                  bool bCenter = false );
                     virtual ~SvxShowText();
 
-    void            SetFont( const Font& rFont );
+    void            SetFont( const vcl::Font& rFont );
     void            SetText( const OUString& rText ) SAL_OVERRIDE;
     void            SetCentered(bool bCenter) { mbCenter = bCenter; }
 
@@ -80,8 +80,8 @@ private:
     FixedText*      m_pSymbolText;
     SvxShowText*    m_pShowChar;
     FixedText*      m_pCharCodeText;
-    Font            aFont;
-    bool        bOne;
+    vcl::Font       aFont;
+    bool            bOne;
     const SubsetMap* pSubsetMap;
 
     DECL_LINK(OKHdl, void *);
@@ -102,8 +102,8 @@ public:
 
     void            DisableFontSelection();
 
-    const Font&     GetCharFont() const { return aFont;}
-    void            SetCharFont( const Font& rFont );
+    const vcl::Font&     GetCharFont() const { return aFont;}
+    void            SetCharFont( const vcl::Font& rFont );
 
     void            SetChar( sal_UCS4 );
     sal_UCS4        GetChar() const;
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 6c56ed05b3ce..5ead54c2c0bc 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -41,7 +41,7 @@ class SvxBrushItem;
 class SvxNumberingPreview : public Window
 {
     const SvxNumRule*   pActNum;
-    Font                aStdFont;
+    vcl::Font           aStdFont;
     long                nPageWidth;
     const OUString*     pOutlineNames;
     bool                bPosition;
@@ -308,7 +308,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
     bool                bMenuButtonInitialized : 1;
 
     std::vector<OUString> aGrfNames;
-    Font                aActBulletFont;
+    vcl::Font             aActBulletFont;
 
     sal_uInt8               nBullet;
     sal_uInt16              nActNumLvl;
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index d9c355e62802..67de02cc84bc 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -43,8 +43,8 @@ public:
 void OptLBoxString_Impl::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 );
     //detect readonly state by asking for a valid Image
     if(pEntry && !(!((OptHeaderTabListBox&)rDev).GetCollapsedEntryBmp(pEntry)))
         aFont.SetColor( Application::GetSettings().GetStyleSettings().GetDeactiveTextColor() );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 469b1f955a0d..bd6edfd16cc3 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -281,10 +281,10 @@ void BrwStringDic_Impl::Paint(
 {
     ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData();
     Point aPos(rPos);
-    Font aOldFont( rDev.GetFont());
+    vcl::Font aOldFont( rDev.GetFont());
     if(pData->IsParent())
     {
-        Font aFont( aOldFont );
+        vcl::Font aFont( aOldFont );
         aFont.SetWeight( WEIGHT_BOLD );
         rDev.SetFont( aFont );
         aPos.X() = 0;
@@ -455,8 +455,8 @@ void BrwString_Impl::Paint(
     {
         Point aNewPos(aPos);
         aNewPos.X() += rDev.GetTextWidth(GetText());
-        Font aOldFont( rDev.GetFont());
-        Font aFont( aOldFont );
+        vcl::Font aOldFont( rDev.GetFont());
+        vcl::Font aFont( aOldFont );
         aFont.SetWeight( WEIGHT_BOLD );
 
         //??? convert the lower byte from the user date into a string
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 29ed3c2e3e82..498a677b341a 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -268,9 +268,9 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet* )
 struct ImpUserData
 {
     OUString  *pString;
-    Font      *pFont;
+    vcl::Font *pFont;
 
-    ImpUserData(OUString* pText, Font* pFnt)
+    ImpUserData(OUString* pText, vcl::Font* pFnt)
         { pString = pText; pFont = pFnt;}
 };
 
@@ -324,8 +324,8 @@ void OfaImpBrwString::Paint(
         ImpUserData* pUserData = (ImpUserData* )pEntry->GetUserData();
         Point aNewPos(rPos);
         aNewPos.X() += rDev.GetTextWidth(GetText());
-        Font aOldFont( rDev.GetFont());
-        Font aFont( aOldFont );
+        vcl::Font aOldFont( rDev.GetFont());
+        vcl::Font aFont( aOldFont );
         if(pUserData->pFont)
         {
             aFont = *pUserData->pFont;
@@ -701,7 +701,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
         pMapDlg->SetChar( (*pUserData->pString)[0] );
         if(RET_OK == pMapDlg->Execute())
         {
-            Font aFont(pMapDlg->GetCharFont());
+            vcl::Font aFont(pMapDlg->GetCharFont());
             *pUserData->pFont = aFont;
             sal_UCS4 aChar = pMapDlg->GetChar();
             // using the UCS4 constructor
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index ebf1a03f6f6d..6937e0c5cd16 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -81,7 +81,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle)
     , mnPos(-1)
     , mnChar(0x0)
 {
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     aFont.SetTransparent( true );
     aFont.SetColor( Application::GetSettings().GetStyleSettings().GetFieldColor() );
     SetFont( aFont );
@@ -149,10 +149,10 @@ void SvxNumberPreview::NotifyChange( const OUString& rPrevStr,
 
 void SvxNumberPreview::Paint( const Rectangle& )
 {
-    Font    aDrawFont   = GetFont();
-    Size    aSzWnd      = GetOutputSizePixel();
-    OUString aTmpStr( aPrevStr );
-    long    nLeadSpace = (aSzWnd.Width()  - GetTextWidth( aTmpStr )) /2;
+    vcl::Font aDrawFont   = GetFont();
+    Size      aSzWnd      = GetOutputSizePixel();
+    OUString  aTmpStr( aPrevStr );
+    long      nLeadSpace = (aSzWnd.Width()  - GetTextWidth( aTmpStr )) /2;
 
     aDrawFont.SetColor( aPrevCol );
     SetFont( aDrawFont );
@@ -830,7 +830,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
 {
     OUString    aEntry;
     OUString    aTmpString;
-    Font        aFont=m_pLbCategory->GetFont();
+    vcl::Font   aFont=m_pLbCategory->GetFont();
     size_t      i = 0;
     short       nTmpCatPos;
     short       aPrivCat;
@@ -877,7 +877,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
             {
                 Color* pPreviewColor = NULL;
                 OUString aPreviewString( GetExpColorString( pPreviewColor, aEntry, aPrivCat ) );
-                Font aEntryFont( m_pLbFormat->GetFont() );
+                vcl::Font aEntryFont( m_pLbFormat->GetFont() );
                 m_pLbFormat->InsertFontEntry( aPreviewString, aEntryFont, pPreviewColor );
             }
             else
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index ca9fe1f38706..2e087739a05a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -156,10 +156,10 @@ static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
     return bRet;
 }
 
-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)
     {
@@ -476,7 +476,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
         bPreset = false;
         bModified = true;
         sal_Unicode cChar = aBulletTypes[m_pExamplesVS->GetSelectItemId() - 1];
-        Font& rActBulletFont = lcl_GetDefaultBulletFont();
+        vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
 
         sal_uInt16 nMask = 1;
         for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -679,7 +679,7 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
 
         SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[m_pExamplesVS->GetSelectItemId() - 1];
 
-        Font& rActBulletFont = lcl_GetDefaultBulletFont();
+        vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
         SvxNumSettings_Impl* pLevelSettings = 0;
         for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
         {
@@ -712,13 +712,13 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
                     {
                         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,
+                        vcl::Font aCreateFont( pLevelSettings->sBulletFont,
                                                 OUString(), Size( 0, 14 ) );
                         aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
                         aCreateFont.SetFamily( FAMILY_DONTKNOW );
@@ -2009,7 +2009,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl)
     boost::scoped_ptr<SvxCharacterMap> pMap(new SvxCharacterMap( this, true ));
 
     sal_uInt16 nMask = 1;
-    const Font* pFmtFont = 0;
+    const vcl::Font* pFmtFont = 0;
     bool bSameBullet = true;
     sal_Unicode cBullet = 0;
     bool bFirst = true;
@@ -2234,10 +2234,10 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
             const SvxNumberFormat& rFmt, sal_uInt16 nXStart,
             sal_uInt16 nYStart, const Size& rSize)
 {
-    Font aTmpFont(pVDev->GetFont());
+    vcl::Font aTmpFont(pVDev->GetFont());
 
     // via Uno it's possible that no font has been set!
-    Font aFont(rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : aTmpFont);
+    vcl::Font aFont(rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : aTmpFont);
     Size aTmpSize(rSize);
     aTmpSize.Width() *= rFmt.GetBulletRelSize();
     aTmpSize.Width() /= 100 ;
@@ -2403,8 +2403,8 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
                     if(pActNum->IsContinuousNumbering())
                         aNum.GetLevelVal()[nLevel] = nPreNum;
                     OUString aText(pActNum->MakeNumString( aNum ));
-                    Font aSaveFont = pVDev->GetFont();
-                    Font aColorFont(aSaveFont);
+                    vcl::Font aSaveFont = pVDev->GetFont();
+                    vcl::Font aColorFont(aSaveFont);
                     Color aTmpBulletColor = rFmt.GetBulletColor();
                     if(aTmpBulletColor.GetColor() == COL_AUTO)
                         aTmpBulletColor = Color(aBackColor.IsDark() ? COL_WHITE : COL_BLACK);
@@ -2526,7 +2526,7 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
                 }
                 else
                 {
-                    Font aColorFont(aStdFont);
+                    vcl::Font aColorFont(aStdFont);
                     Color aTmpBulletColor = rFmt.GetBulletColor();
                     if(aTmpBulletColor.GetColor() == COL_AUTO)
                         aTmpBulletColor = Color(aBackColor.IsDark() ? COL_WHITE : COL_BLACK);