fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

4 files changed, 15 insertions, 15 deletions

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 ];