fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

22 files changed, 69 insertions, 69 deletions

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index dc31300532f8..93dc00424cbe 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1996,7 +1996,7 @@ void EditDoc::RemoveItemsFromPool(const ContentNode& rNode)
 
 void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, short nScriptType )
 {
-    Font aPrevFont( rFont );
+    vcl::Font aPrevFont( rFont );
     rFont.SetAlign( ALIGN_BASELINE );
     rFont.SetTransparent( true );
 
@@ -2255,7 +2255,7 @@ EditPaM EditDoc::RemoveText()
     ContentNode* pPrevFirstNode = GetObject(0);
     SfxStyleSheet* pPrevStyle = pPrevFirstNode->GetStyleSheet();
     SfxItemSet aPrevSet( pPrevFirstNode->GetContentAttribs().GetItems() );
-    Font aPrevFont( pPrevFirstNode->GetCharAttribs().GetDefFont() );
+    vcl::Font aPrevFont( pPrevFirstNode->GetCharAttribs().GetDefFont() );
 
     ImplDestroyContents();
 
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 9f0e73f2ad92..00355e7a0213 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1747,7 +1747,7 @@ void EditEngine::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAt
     pImpEditEngine->FormatAndUpdate();
 }
 
-Font EditEngine::GetStandardFont( sal_Int32 nPara )
+vcl::Font EditEngine::GetStandardFont( sal_Int32 nPara )
 {
     return GetStandardSvxFont( nPara );
 }
@@ -2578,7 +2578,7 @@ SfxItemPool& EditEngine::GetGlobalItemPool()
     return *pGlobalPool;
 }
 
-void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const Font& rFont )
+void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const vcl::Font& rFont )
 {
     SvxFont aSvxFont( rFont );
     SetFontInfoInItemSet( rSet, aSvxFont );
@@ -2609,7 +2609,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const SvxFont& rFont )
     rSet.Put( SvxCharReliefItem( rFont.GetRelief(), EE_CHAR_RELIEF ) );
 }
 
-Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType )
+vcl::Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType )
 {
     SvxFont aFont;
     CreateFont( aFont, rItemSet, true, nScriptType );
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index a908480e74d0..db0444b62ec5 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -704,7 +704,7 @@ EESpellState EditView::StartThesaurus()
 }
 
 void EditView::StartTextConversion(
-        LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
+        LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont,
         sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc )
 {
     pImpEditView->pEditEngine->pImpEditEngine->Convert( this, nSrcLang, nDestLang, pDestFont, nOptions, bIsInteractive, bMultipleDoc );
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 38065cf8df27..15d8c59f54cd 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -652,7 +652,7 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
     // Choose a proportional Font for Pre
     if ( nHLevel == STYLE_PRE )
     {
-        Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
+        vcl::Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
         SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
         aItems.Put( aFontItem );
 
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 765c73085c5f..fc9779775cc9 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -151,7 +151,7 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r
     MapMode _aEditMapMode(mpEditEngine->GetRefDevice()->GetMapMode().GetMapUnit());
     aSz = mpEditEngine->GetRefDevice()->LogicToLogic(aSz, &aPntMode, &_aEditMapMode);
     SvxFontHeightItem aFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT );
-    Font aDefFont( GetDefFont() );
+    vcl::Font aDefFont( GetDefFont() );
     SvxFontItem aFontItem( aDefFont.GetFamily(), aDefFont.GetName(),
                     aDefFont.GetStyleName(), aDefFont.GetPitch(), aDefFont.GetCharSet(), EE_CHAR_FONTINFO );
 
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index e662aad9246d..1f1b9d5c26a7 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -107,7 +107,7 @@ public:
                 GetDestCharSet() const              { return eDestCharSet; }
 
     sal_uInt16      GetDefTab() const                   { return nDefTab; }
-    Font        GetDefFont()                        { return GetFont( nDefFont ); }
+    vcl::Font       GetDefFont()                        { return GetFont( nDefFont ); }
 
     EditPaM     GetCurPaM() const                   { return aCurSel.Max(); }
 };
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 849ca753c43a..634aaa0b8b92 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -915,14 +915,14 @@ public:
                         ImpSpell( EditView* pEditView );
 
     // text conversion functions
-    void                Convert( EditView* pEditView, LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc );
+    void                Convert( EditView* pEditView, LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc );
     void                ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange,
-                                    bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const Font *pTargetFont );
+                                    bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const vcl::Font *pTargetFont );
     ConvInfo *          GetConvInfo() const { return pConvInfo; }
     bool            HasConvertibleTextPortion( LanguageType nLang );
     void                SetLanguageAndFont( const ESelection &rESel,
                                 LanguageType nLang, sal_uInt16 nLangWhichId,
-                                const Font *pFont,  sal_uInt16 nFontWhichId );
+                                const vcl::Font *pFont,  sal_uInt16 nFontWhichId );
 
     // returns true if input sequence checking should be applied
     bool            IsInputSequenceCheckingRequired( sal_Unicode nChar, const EditSelection& rCurSel ) const;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 09367ca1fd67..0b26a0738656 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -368,7 +368,7 @@ void ImpEditEngine::FormatDoc()
     long nY = 0;
     bool bGrow = false;
 
-    Font aOldFont( GetRefDevice()->GetFont() );
+    vcl::Font aOldFont( GetRefDevice()->GetFont() );
 
     // Here already, so that not always in CreateLines...
     bool bMapChanged = ImpCheckRefMapMode();
@@ -2857,7 +2857,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
     Point aRedLineTmpPos;
     DBG_ASSERT( GetParaPortions().Count(), "No ParaPortion?!" );
     SvxFont aTmpFont( GetParaPortions()[0]->GetNode()->GetCharAttribs().GetDefFont() );
-    Font aOldFont( pOutDev->GetFont() );
+    vcl::Font aOldFont( pOutDev->GetFont() );
     vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST( vcl::PDFExtOutDevData, pOutDev->GetExtOutDevData() );
 
     // In the case of rotated text is aStartPos considered TopLeft because
@@ -3186,7 +3186,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
 
                                     pTmpDXArray.reset(new long[ aText.getLength() ]);
                                     pDXArray = pTmpDXArray.get();
-                                    Font _aOldFont( GetRefDevice()->GetFont() );
+                                    vcl::Font _aOldFont( GetRefDevice()->GetFont() );
                                     aTmpFont.SetPhysFont( GetRefDevice() );
                                     aTmpFont.QuickGetTextSize( GetRefDevice(), aText, nTextStart, nTextLen, pTmpDXArray.get() );
                                     if ( aStatus.DoRestoreFont() )
@@ -3216,7 +3216,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
                                     // crash when accessing 0 pointer in pDXArray
                                     pTmpDXArray.reset(new long[ aText.getLength() ]);
                                     pDXArray = pTmpDXArray.get();
-                                    Font _aOldFont( GetRefDevice()->GetFont() );
+                                    vcl::Font _aOldFont( GetRefDevice()->GetFont() );
                                     aTmpFont.SetPhysFont( GetRefDevice() );
                                     aTmpFont.QuickGetTextSize( GetRefDevice(), aText, 0, aText.getLength(), pTmpDXArray.get() );
                                     if ( aStatus.DoRestoreFont() )
@@ -3925,7 +3925,7 @@ void ImpEditEngine::ShowParagraph( sal_Int32 nParagraph, bool bShow )
             {
                 if ( pPPortion->IsInvalid() )
                 {
-                    Font aOldFont( GetRefDevice()->GetFont() );
+                    vcl::Font aOldFont( GetRefDevice()->GetFont() );
                     CreateLines( nParagraph, 0 );   // 0: No TextRanger
                     if ( aStatus.DoRestoreFont() )
                         GetRefDevice()->SetFont( aOldFont );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index db404f03340e..bc1986abb535 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1551,7 +1551,7 @@ bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
 
 
 void ImpEditEngine::Convert( EditView* pEditView,
-        LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
+        LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont,
         sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc )
 {
     // modified version of ImpEditEngine::Spell
@@ -1641,7 +1641,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
 void ImpEditEngine::SetLanguageAndFont(
     const ESelection &rESel,
     LanguageType nLang, sal_uInt16 nLangWhichId,
-    const Font *pFont,  sal_uInt16 nFontWhichId )
+    const vcl::Font *pFont,  sal_uInt16 nFontWhichId )
 {
     ESelection aOldSel = pActiveView->GetSelection();
     pActiveView->SetSelection( rESel );
@@ -1674,7 +1674,7 @@ void ImpEditEngine::SetLanguageAndFont(
 void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang,
         EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange,
         bool bAllowImplicitChangesForNotConvertibleText,
-        LanguageType nTargetLang, const Font *pTargetFont  )
+        LanguageType nTargetLang, const vcl::Font *pTargetFont  )
 {
     // modified version of ImpEditEngine::ImpSpell
 
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index f843f8330873..92035210ae69 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -46,7 +46,7 @@ TextConvWrapper::TextConvWrapper( Window* pWindow,
         const Reference< XComponentContext >& rxContext,
         const Locale& rSourceLocale,
         const Locale& rTargetLocale,
-        const Font* pTargetFont,
+        const vcl::Font* pTargetFont,
         sal_Int32 nOptions,
         bool bIsInteractive,
         bool bIsStart,
@@ -245,7 +245,7 @@ bool TextConvWrapper::ConvContinue_impl()
 
 void TextConvWrapper::SetLanguageAndFont( const ESelection &rESel,
     LanguageType nLang, sal_uInt16 nLangWhichId,
-    const Font *pFont,  sal_uInt16 nFontWhichId )
+    const vcl::Font *pFont,  sal_uInt16 nFontWhichId )
 {
     ESelection aOldSel = m_pEditView->GetSelection();
     m_pEditView->SetSelection( rESel );
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index a3afc6063722..d8073b758925 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -90,7 +90,7 @@ protected:
 
     void SetLanguageAndFont( const ESelection &rESel,
                             LanguageType nLang, sal_uInt16 nLangWhichId,
-                            const Font *pFont,  sal_uInt16 nFontWhichId );
+                            const vcl::Font *pFont,  sal_uInt16 nFontWhichId );
 
 
 public:
@@ -98,7 +98,7 @@ public:
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
             const ::com::sun::star::lang::Locale& rSourceLocale,
             const ::com::sun::star::lang::Locale& rTargetLocale,
-            const Font* pTargetFont,
+            const vcl::Font* pTargetFont,
             sal_Int32 nOptions,
             bool bIsInteractive,
             bool bIsStart, EditView* pView );
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 28f4dfdd4e1d..68eaf2c2993b 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -34,7 +34,7 @@ TYPEINIT1(SvxBulletItem,SfxPoolItem);
 
 
 
-void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
+void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont )
 {
     sal_uInt16 nTemp;
 
@@ -61,9 +61,9 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
 
 
 
-Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
+vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
 {
-    Font aFont;
+    vcl::Font aFont;
     Color aColor;
     ReadColor( rStream, aColor );    aFont.SetColor( aColor );
     sal_uInt16 nTemp;
@@ -237,8 +237,8 @@ sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const
 
 void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
 {
-    Font _aFont = GetFont();
-    Font aNewFont = rCopyFrom.GetFont();
+    vcl::Font _aFont = GetFont();
+    vcl::Font aNewFont = rCopyFrom.GetFont();
     if ( rCopyFrom.IsValid( VALID_FONTNAME ) )
     {
         _aFont.SetName( aNewFont.GetName() );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 56cfeaccf901..24c2ef1e138e 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -219,7 +219,7 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
     rStream.ReadUInt16( hasBulletFont );
     if ( hasBulletFont )
     {
-        pBulletFont = new Font( );
+        pBulletFont = new vcl::Font( );
         ReadFont( rStream, *pBulletFont );
     }
     else pBulletFont = NULL;
@@ -345,7 +345,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
     }
     DELETEZ(pBulletFont);
     if(rFormat.pBulletFont)
-            pBulletFont = new Font(*rFormat.pBulletFont);
+            pBulletFont = new vcl::Font(*rFormat.pBulletFont);
     return *this;
 }
 
@@ -443,10 +443,10 @@ sal_Int16    SvxNumberFormat::GetVertOrient() const
     return eVertOrient;
 }
 
-void SvxNumberFormat::SetBulletFont(const Font* pFont)
+void SvxNumberFormat::SetBulletFont(const vcl::Font* pFont)
 {
     delete pBulletFont;
-    pBulletFont = pFont ? new Font(*pFont): 0;
+    pBulletFont = pFont ? new vcl::Font(*pFont): 0;
 }
 
 void SvxNumberFormat::SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode )
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index e5609605a904..a306c68901bd 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -39,7 +39,7 @@ SvxFont::SvxFont()
     SetLanguage(LANGUAGE_SYSTEM);
 }
 
-SvxFont::SvxFont( const Font &rFont )
+SvxFont::SvxFont( const vcl::Font &rFont )
     : Font( rFont )
 {
     nKern = nEsc = 0;
@@ -319,7 +319,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const
 
 void SvxFont::SetPhysFont( OutputDevice *pOut ) const
 {
-    const Font& rCurrentFont = pOut->GetFont();
+    const vcl::Font& rCurrentFont = pOut->GetFont();
     if ( nPropr == 100 )
     {
         if ( !rCurrentFont.IsSameInstance( *this ) )
@@ -337,9 +337,9 @@ void SvxFont::SetPhysFont( OutputDevice *pOut ) const
 }
 
 
-Font SvxFont::ChgPhysFont( OutputDevice *pOut ) const
+vcl::Font SvxFont::ChgPhysFont( OutputDevice *pOut ) const
 {
-    Font aOldFont( pOut->GetFont() );
+    vcl::Font aOldFont( pOut->GetFont() );
     SetPhysFont( pOut );
     return aOldFont;
 }
@@ -566,7 +566,7 @@ void SvxFont::DrawPrev( OutputDevice *pOut, Printer* pPrinter,
 }
 
 
-SvxFont& SvxFont::operator=( const Font& rFont )
+SvxFont& SvxFont::operator=( const vcl::Font& rFont )
 {
     Font::operator=( rFont );
     return *this;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ebb8153064a0..c47215ede3c5 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3470,7 +3470,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
 
     for ( sal_uInt16 n = 0; n < nItemCnt; ++n )
     {
-        Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType,
+        vcl::Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType,
                                                   aOutTypeArr[ n ].nLanguage,
                                                   DEFAULTFONT_FLAGS_ONLYONE, 0 ) );
         SvxFontItem* pItem = aItemArr[ n ];
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 264633070a26..506ed316f1e0 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -82,7 +82,7 @@ namespace editeng
                                                     // save the applications from always converting to this
                                                     // type in their implementations
         LanguageType            m_nTargetLang;      // target language of new replacement text
-        const Font*             m_pTargetFont;      // target font of new replacement text
+        const vcl::Font*        m_pTargetFont;      // target font of new replacement text
         sal_Int32               m_nConvOptions;     // text conversion options (as used by 'getConversions')
         bool                    m_bIsInteractive;   // specifies if the conversion requires user interaction
                                                     // (and likeley a specialised dialog) or if it is to run
@@ -123,7 +123,7 @@ namespace editeng
             const Reference< XComponentContext >& rxContext,
             const Locale& _rSourceLocale,
             const Locale& _rTargetLocale,
-            const Font* _pTargetFont,
+            const vcl::Font* _pTargetFont,
             sal_Int32 _nConvOptions,
             bool _bIsInteractive,
             HangulHanjaConversion* _pAntiImpl );
@@ -137,7 +137,7 @@ namespace editeng
 
         inline LanguageType GetSourceLang() const   { return m_nSourceLang; }
         inline LanguageType GetTargetLang() const   { return m_nTargetLang; }
-        inline const Font * GetTargetFont() const   { return m_pTargetFont; }
+        inline const vcl::Font * GetTargetFont() const   { return m_pTargetFont; }
         inline sal_Int32    GetConvOptions() const  { return m_nConvOptions; }
         inline bool         IsInteractive() const   { return m_bIsInteractive; }
 
@@ -233,7 +233,7 @@ namespace editeng
                                                             const Reference< XComponentContext >& rxContext,
                                                             const Locale& _rSourceLocale,
                                                             const Locale& _rTargetLocale,
-                                                            const Font* _pTargetFont,
+                                                            const vcl::Font* _pTargetFont,
                                                             sal_Int32 _nOptions,
                                                             bool _bIsInteractive,
                                                             HangulHanjaConversion* _pAntiImpl )
@@ -968,7 +968,7 @@ namespace editeng
     HangulHanjaConversion::HangulHanjaConversion( Window* _pUIParent,
         const Reference< XComponentContext >& rxContext,
         const Locale& _rSourceLocale, const Locale& _rTargetLocale,
-        const Font* _pTargetFont,
+        const vcl::Font* _pTargetFont,
         sal_Int32 _nOptions, bool _bIsInteractive)
         :m_pImpl( new HangulHanjaConversion_Impl( _pUIParent, rxContext, _rSourceLocale, _rTargetLocale, _pTargetFont, _nOptions, _bIsInteractive, this ) )
     {
@@ -998,7 +998,7 @@ namespace editeng
         return m_pImpl->GetTargetLang();
     }
 
-    const Font * HangulHanjaConversion::GetTargetFont( ) const
+    const vcl::Font * HangulHanjaConversion::GetTargetFont( ) const
     {
         return m_pImpl->GetTargetFont();
     }
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 74aba0240aef..b4b44aa42cf6 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -853,12 +853,12 @@ bool Outliner::Collapse( Paragraph* pPara )
 }
 
 
-Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
+vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
 {
     const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
     DBG_ASSERT( pFmt && ( pFmt->GetNumberingType() != SVX_NUM_BITMAP ) && ( pFmt->GetNumberingType() != SVX_NUM_NUMBER_NONE ), "ImpCalcBulletFont: Missing or BitmapBullet!" );
 
-    Font aStdFont;
+    vcl::Font aStdFont;
     if ( !pEditEngine->IsFlatMode() )
     {
         ESelection aSel( nPara, 0, nPara, 0 );
@@ -869,8 +869,8 @@ Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
         aStdFont = pEditEngine->GetStandardFont( nPara );
     }
 
-    Font aBulletFont;
-    const Font *pSourceFont = 0;
+    vcl::Font aBulletFont;
+    const vcl::Font *pSourceFont = 0;
     if ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
     {
         pSourceFont = pFmt->GetBulletFont();
@@ -949,11 +949,11 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
         {
             if( pFmt->GetNumberingType() != SVX_NUM_BITMAP )
             {
-                Font aBulletFont( ImpCalcBulletFont( nPara ) );
+                vcl::Font aBulletFont( ImpCalcBulletFont( nPara ) );
                 // Use baseline
                 bool bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
                 aBulletFont.SetAlign( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE );
-                Font aOldFont = pOutDev->GetFont();
+                vcl::Font aOldFont = pOutDev->GetFont();
                 pOutDev->SetFont( aBulletFont );
 
                 ParagraphInfos  aParaInfos = pEditEngine->GetParagraphInfos( nPara );
@@ -990,7 +990,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
                     aTextPos = aRotatedPos;
                     // Translation...
                     aTextPos += rOrigin;
-                    Font aRotatedFont( aBulletFont );
+                    vcl::Font aRotatedFont( aBulletFont );
                     aRotatedFont.SetOrientation( nOrientation );
                     pOutDev->SetFont( aRotatedFont );
                 }
@@ -1004,7 +1004,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
 
                 if(bStrippingPortions)
                 {
-                    const Font aSvxFont(pOutDev->GetFont());
+                    const vcl::Font aSvxFont(pOutDev->GetFont());
                     boost::scoped_array<long> pBuf(new long[ pPara->GetText().getLength() ]);
                     pOutDev->GetTextArray( pPara->GetText(), pBuf.get() );
 
@@ -1479,8 +1479,8 @@ Size Outliner::ImplGetBulletSize( sal_Int32 nPara )
         {
             OUString aBulletText = ImplGetBulletText( nPara );
             OutputDevice* pRefDev = pEditEngine->GetRefDevice();
-            Font aBulletFont( ImpCalcBulletFont( nPara ) );
-            Font aRefFont( pRefDev->GetFont());
+            vcl::Font aBulletFont( ImpCalcBulletFont( nPara ) );
+            vcl::Font aRefFont( pRefDev->GetFont());
             pRefDev->SetFont( aBulletFont );
             pPara->aBulSize.Width() = pRefDev->GetTextWidth( aBulletText );
             pPara->aBulSize.Height() = pRefDev->GetTextHeight();
@@ -1607,11 +1607,11 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bRetu
             // may prefer to print out on the baseline ...
             if( ( pFmt->GetNumberingType() != SVX_NUM_NUMBER_NONE ) && ( pFmt->GetNumberingType() != SVX_NUM_BITMAP ) && ( pFmt->GetNumberingType() != SVX_NUM_CHAR_SPECIAL ) )
             {
-                Font aBulletFont( ImpCalcBulletFont( nPara ) );
+                vcl::Font aBulletFont( ImpCalcBulletFont( nPara ) );
                 if ( aBulletFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL )
                 {
                     OutputDevice* pRefDev = pEditEngine->GetRefDevice();
-                    Font aOldFont = pRefDev->GetFont();
+                    vcl::Font aOldFont = pRefDev->GetFont();
                     pRefDev->SetFont( aBulletFont );
                     FontMetric aMetric( pRefDev->GetFontMetric() );
                     // Leading on the first line ...
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 3c3c0db7cf43..5ca6729b3b83 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1270,7 +1270,7 @@ EESpellState OutlinerView::StartThesaurus()
 }
 
 void OutlinerView::StartTextConversion(
-    LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
+    LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont,
     sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc )
 {
     if (
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index eefc873a6f0f..9ca6da88a35f 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -646,7 +646,7 @@ SET_FONTALIGNMENT:
             case RTF_F:
             case RTF_AF:
                 {
-                    const Font& rSVFont = GetFont( sal_uInt16(nTokenValue) );
+                    const vcl::Font& rSVFont = GetFont( sal_uInt16(nTokenValue) );
                     SvxFontItem aTmpItem( rSVFont.GetFamily(),
                                     rSVFont.GetName(), rSVFont.GetStyleName(),
                                     rSVFont.GetPitch(), rSVFont.GetCharSet(),
@@ -1804,7 +1804,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
             //we can fall back to the ansicpg set codeset
             if (nDfltFont != -1)
             {
-                const Font& rSVFont = GetFont(sal_uInt16(nDfltFont));
+                const vcl::Font& rSVFont = GetFont(sal_uInt16(nDfltFont));
                 SetEncoding(rSVFont.GetCharSet());
             }
             else
@@ -1828,7 +1828,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
         {
             if( -1 == nValue )
                 nValue = 0;
-            const Font& rSVFont = GetFont( sal_uInt16(nValue) );
+            const vcl::Font& rSVFont = GetFont( sal_uInt16(nValue) );
             SvxFontItem aTmpItem(
                                 rSVFont.GetFamily(), rSVFont.GetName(),
                                 rSVFont.GetStyleName(), rSVFont.GetPitch(),
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 625028e0c721..eced58896490 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -90,7 +90,7 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
         aPardMap.insert( aPardMap.begin(), (sal_uInt16*)&aTmp,
                 (sal_uInt16*)&aTmp + (sizeof( RTFPardAttrMapIds ) / sizeof(sal_uInt16)) );
     }
-    pDfltFont = new Font;
+    pDfltFont = new vcl::Font;
     pDfltColor = new Color;
 }
 
@@ -465,7 +465,7 @@ void SvxRTFParser::ReadFontTable()
 {
     int nToken;
     int _nOpenBrakets = 1;      // the first was already detected earlier!!
-    Font* pFont = new Font();
+    vcl::Font* pFont = new vcl::Font();
     short nFontNo(0), nInsFontNo (0);
     OUString sAltNm, sFntNm;
     bool bIsAltFntNm = false, bCheckNewFont;
@@ -582,7 +582,7 @@ void SvxRTFParser::ReadFontTable()
 
             pFont->SetName( sFntNm );
             aFontTbl.insert( nInsFontNo, pFont );
-            pFont = new Font();
+            pFont = new vcl::Font();
             pFont->SetCharSet( nSystemChar );
             sAltNm = "";
             sFntNm = "";
@@ -814,10 +814,10 @@ OUString& SvxRTFParser::DelCharAtEnd( OUString& rStr, const sal_Unicode cDel )
 }
 
 
-const Font& SvxRTFParser::GetFont( sal_uInt16 nId )
+const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId )
 {
     SvxRTFFontTbl::const_iterator it = aFontTbl.find( nId );
-    const Font* pFont;
+    const vcl::Font* pFont;
     if( it == aFontTbl.end() )
     {
         const SvxFontItem& rDfltFont = (const SvxFontItem&)
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index ac3324477954..f375fcaa668f 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -39,7 +39,7 @@ using namespace ::rtl;
 using namespace ::com::sun::star;
 
 
-void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, Font& rFont )
+void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, vcl::Font& rFont )
 {
     rFont.SetName( rDesc.Name );
     rFont.SetStyleName( rDesc.StyleName );
@@ -56,7 +56,7 @@ void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, Font
     rFont.SetWordLineMode( rDesc.WordLineMode );
 }
 
-void SvxUnoFontDescriptor::ConvertFromFont( const Font& rFont, awt::FontDescriptor& rDesc )
+void SvxUnoFontDescriptor::ConvertFromFont( const vcl::Font& rFont, awt::FontDescriptor& rDesc )
 {
     rDesc.Name = rFont.GetName();
     rDesc.StyleName = rFont.GetStyleName();
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index affe4f884a9d..2b0ce3824fd4 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -351,7 +351,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
             awt::FontDescriptor aDesc;
             if( aVal >>= aDesc )
             {
-                Font aFont;
+                vcl::Font aFont;
                 SvxUnoFontDescriptor::ConvertToFont( aDesc, aFont );
                 aFmt.SetBulletFont(&aFont);
                 continue;