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, 78 insertions, 78 deletions

diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 7b3161fcaac8..9e63078ecc85 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -149,7 +149,7 @@ private:
 class FlashFont
 {
 public:
-    FlashFont( const Font& rFont, sal_uInt16 nId );
+    FlashFont( const vcl::Font& rFont, sal_uInt16 nId );
     ~FlashFont();
 
     sal_uInt16 getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev );
@@ -157,10 +157,10 @@ public:
     void write( SvStream& out );
 
     sal_uInt16 getID() const { return mnId; }
-    const Font& getFont() { return maFont; }
+    const vcl::Font& getFont() { return maFont; }
 
 private:
-    const Font  maFont;
+    const vcl::Font maFont;
     std::map<sal_uInt16, sal_uInt16, ltuint16> maGlyphIndex;
     sal_uInt16 mnNextIndex;
     sal_uInt16 mnId;
@@ -354,7 +354,7 @@ private:
     bool Impl_writeFilling( SvtGraphicFill& rFilling );
     bool Impl_writeStroke( SvtGraphicStroke& rStroke );
 
-    FlashFont& Impl_getFont( const Font& rFont );
+    FlashFont& Impl_getFont( const vcl::Font& rFont );
 
     static void Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, bool bFilled );
 
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index dedcb983d14d..89c0c22cc2f4 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -370,7 +370,7 @@ void Writer::setClipping( const PolyPolygon* pClipPolyPolygon )
 //  differences in font that actually require different glyphs to be defined,
 //  and some that don't.  This function is meant to capture all the differences
 //  that we care about.
-bool compare_fonts_for_me(const Font& rFont1, const Font& rFont2)
+bool compare_fonts_for_me(const vcl::Font& rFont1, const vcl::Font& rFont2)
 {
     return rFont1.GetName() == rFont2.GetName() &&
             rFont1.GetWeight() == rFont2.GetWeight() &&
@@ -382,14 +382,14 @@ bool compare_fonts_for_me(const Font& rFont1, const Font& rFont2)
 
 
 
-FlashFont& Writer::Impl_getFont( const Font& rFont )
+FlashFont& Writer::Impl_getFont( const vcl::Font& rFont )
 {
     FontMap::iterator aIter( maFonts.begin() );
     const FontMap::iterator aEnd( maFonts.end() );
 
     for(; aIter != aEnd; ++aIter)
     {
-        const Font tempFont = (*aIter)->getFont();
+        const vcl::Font tempFont = (*aIter)->getFont();
         if( compare_fonts_for_me(tempFont, rFont) )
         {
             return **aIter;
@@ -553,10 +553,10 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
             }
         }
 
-        Font aOldFont( mpVDev->GetFont() );
+        vcl::Font aOldFont( mpVDev->GetFont() );
         Point               aBaseLinePos( rPos );
 
-        Font aFont(aOldFont);
+        vcl::Font aFont(aOldFont);
         short nOrientation = aFont.GetOrientation();
         aFont.SetOrientation( 0 );
         aFont.SetUnderline(UNDERLINE_NONE);
@@ -603,7 +603,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
         // scale width if we have a stretched text
         if( 0 != aFont.GetSize().Width() )
         {
-            Font aTmpFont( aFont );
+            vcl::Font aTmpFont( aFont );
             aTmpFont.SetWidth(0);
             mpVDev->SetFont( aTmpFont );
 
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 6a2a40529851..b11512aacaa0 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -425,7 +425,7 @@ sal_uInt32 swf::getFixed( double fValue )
 
 
 /** constructs a new flash font for the given VCL Font */
-FlashFont::FlashFont( const Font& rFont, sal_uInt16 nId )
+FlashFont::FlashFont( const vcl::Font& rFont, sal_uInt16 nId )
 : maFont( rFont ), mnNextIndex(0), mnId( nId )
 {
 }
@@ -452,8 +452,8 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
 
     maGlyphIndex[nChar] = mnNextIndex;
 
-    Font aOldFont( pVDev->GetFont() );
-    Font aNewFont( aOldFont );
+    vcl::Font aOldFont( pVDev->GetFont() );
+    vcl::Font aNewFont( aOldFont );
     aNewFont.SetAlign( ALIGN_BASELINE );
     pVDev->SetFont( aNewFont );
     aOldFont.SetOrientation(0);
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index a217c58f4d00..90fb53d52e5d 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -115,7 +115,7 @@ struct METGDIStackMember
     Color                       aLineColor;
     Color                       aFillColor;
     RasterOp                    eRasterOp;
-    Font                        aFont;
+    vcl::Font                   aFont;
     MapMode                     aMapMode;
     Rectangle                   aClipRect;
 };
@@ -135,7 +135,7 @@ private:
     Color               aGDILineColor;
     Color               aGDIFillColor;
     RasterOp            eGDIRasterOp;
-    Font                aGDIFont;
+    vcl::Font           aGDIFont;
     MapMode             aGDIMapMode;   // currently ununsed!
     Rectangle           aGDIClipRect; // currently ununsed!
     METGDIStackMember*  pGDIStack;
@@ -181,9 +181,9 @@ private:
     void WriteFieldId(sal_uInt32 nId);
 
     void CreateChrSets(const GDIMetaFile * pMTF);
-    void CreateChrSet(const Font & rFont);
+    void CreateChrSet(const vcl::Font & rFont);
     void WriteChrSets();
-    sal_uInt8 FindChrSet(const Font & rFont);
+    sal_uInt8 FindChrSet(const vcl::Font & rFont);
 
     void WriteColorAttributeTable(sal_uInt32 nFieldId=4, BitmapPalette* pPalette=NULL,
                                   sal_uInt8 nBasePartFlags=0x40, sal_uInt8 nBasePartLCTID=0);
@@ -422,7 +422,7 @@ void METWriter::CreateChrSets(const GDIMetaFile * pMTF)
 }
 
 
-void METWriter::CreateChrSet(const Font & rFont)
+void METWriter::CreateChrSet(const vcl::Font & rFont)
 {
     METChrSet * pCS;
 
@@ -437,7 +437,7 @@ void METWriter::CreateChrSet(const Font & rFont)
 }
 
 
-sal_uInt8 METWriter::FindChrSet(const Font & rFont)
+sal_uInt8 METWriter::FindChrSet(const vcl::Font & rFont)
 {
     METChrSet* pCS;
 
@@ -2523,7 +2523,7 @@ bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, Filt
     aGDILineColor=Color( COL_BLACK );
     aGDIFillColor=Color( COL_WHITE );
     eGDIRasterOp=ROP_OVERPAINT;
-    aGDIFont=Font();
+    aGDIFont=vcl::Font();
     aGDIMapMode=MapMode();
     aGDIClipRect=Rectangle();
     pGDIStack=NULL;
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index d8f929f8ff8a..9a44f45276be 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -45,7 +45,7 @@ struct PictWriterAttrStackMember {
     Color                               aLineColor;
     Color                               aFillColor;
     RasterOp                            eRasterOp;
-    Font                                aFont;
+    vcl::Font                           aFont;
     MapMode                             aMapMode;
     Rectangle                           aClipRect;
 };
@@ -74,7 +74,7 @@ private:
     Color       aLineColor;
     Color       aFillColor;
     RasterOp    eSrcRasterOp;
-    Font        aSrcFont;
+    vcl::Font   aSrcFont;
     MapMode     aSrcMapMode;
     MapMode     aTargetMapMode;
     Rectangle   aClipRect;
@@ -125,7 +125,7 @@ private:
     void ConvertLinePattern(PictPattern & rPat, bool bVisible) const;
     void ConvertFillPattern(PictPattern & rPat, bool bVisible) const;
 
-    void WriteOpcode_TxFace(const Font & rFont);
+    void WriteOpcode_TxFace(const vcl::Font & rFont);
     void WriteOpcode_TxMode(RasterOp eMode);
     void WriteOpcode_PnSize(sal_uInt16 nSize);
     void WriteOpcode_PnMode(RasterOp eMode);
@@ -138,7 +138,7 @@ private:
     void WriteOpcode_Line(const Point & rLocPt, const Point & rNewPt);
     void WriteOpcode_LineFrom(const Point & rNewPt);
     void WriteOpcode_Text(const Point & rPoint, const OUString& rString, bool bDelta);
-    void WriteOpcode_FontName(const Font & rFont);
+    void WriteOpcode_FontName(const vcl::Font & rFont);
     void WriteOpcode_ClipRect( const Rectangle& rRect );
     void WriteOpcode_Rect(PictDrawingMethod eMethod, const Rectangle & rRect);
     void WriteOpcode_SameRect(PictDrawingMethod eMethod);
@@ -445,7 +445,7 @@ void PictWriter::ConvertFillPattern(PictPattern & rPat, bool bVisible) const
 }
 
 
-void PictWriter::WriteOpcode_TxFace(const Font & rFont)
+void PictWriter::WriteOpcode_TxFace(const vcl::Font & rFont)
 {
     sal_uInt8 nFace;
     FontWeight eWeight;
@@ -676,7 +676,7 @@ void PictWriter::WriteOpcode_Text(const Point & rPoint, const OUString& rString,
 }
 
 
-void PictWriter::WriteOpcode_FontName(const Font & rFont)
+void PictWriter::WriteOpcode_FontName(const vcl::Font & rFont)
 {
     sal_uInt16 nDataLen,nFontId;
 
@@ -2204,7 +2204,7 @@ bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStream, F
     aLineColor=Color( COL_BLACK );
     aFillColor=Color( COL_WHITE );
     eSrcRasterOp=ROP_OVERPAINT;
-    aSrcFont=Font();
+    aSrcFont=vcl::Font();
     aSrcMapMode = rMTF.GetPrefMapMode();
 
     aMap72.SetScaleX( aDPIFrac );
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index fc2d28573268..28f7fa1afc32 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -79,7 +79,7 @@ struct StackMember
     bool        bTextFillCol;
     Color       aTextFillCol;
     Color       aBackgroundCol;
-    Font        aFont;
+    vcl::Font   aFont;
     TextAlign   eTextAlign;
 
     double                      fLineWidth;
@@ -142,8 +142,8 @@ private:
     SvtGraphicStroke::JoinType  eJoinType;
     SvtGraphicStroke::DashArray aDashArray;
 
-    Font                maFont;
-    Font                maLastFont;
+    vcl::Font           maFont;
+    vcl::Font           maLastFont;
     sal_uInt8           nChrSet;
     ChrSet*             pChrSetList;        // list of character sets
     sal_uInt8           nNextChrSetId;      // first unused ChrSet-Id
@@ -1142,7 +1142,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                     aTextFillColor = pGS->aTextFillCol;
                     aBackgroundColor = pGS->aBackgroundCol;
                     maFont = pGS->aFont;
-                    maLastFont = Font();                // set maLastFont != maFont -> so that
+                    maLastFont = vcl::Font();                // set maLastFont != maFont -> so that
                     delete pGS;
                     sal_uInt32 nCurrentPos = mpPS->Tell();
                     if ( nCurrentPos - 3 == mnLatestPush )
@@ -2138,7 +2138,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const lo
         return;
     if ( mnTextMode == 0 )  // using glpyh outlines
     {
-        Font    aNotRotatedFont( maFont );
+        vcl::Font    aNotRotatedFont( maFont );
         aNotRotatedFont.SetOrientation( 0 );
 
         VirtualDevice aVirDev( 1 );
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 5cf89f42c544..ba8f3fe0022e 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -190,7 +190,7 @@ bool DXF2GDIMetaFile::SetFontAttribute(const DXFBasicEntity & rE, short nAngle,
 {
     long nColor;
     Color aColor;
-    Font aFont;
+    vcl::Font aFont;
 
     nAngle=-nAngle;
     while (nAngle>3600) nAngle-=3600;
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index 7d7dca35526a..354cd09734ab 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -51,7 +51,7 @@ private:
     DXFLineInfo aParentLayerDXFLineInfo;
     Color       aActLineColor;
     Color       aActFillColor;
-    Font        aActFont;
+    vcl::Font   aActFont;
 
     sal_uLong CountEntities(const DXFEntities & rEntities);
 
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 645373b99e31..20a48869e638 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -443,7 +443,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
 {
     GDIMetaFile aMtf;
     VirtualDevice   aVDev;
-    Font            aFont;
+    vcl::Font       aFont;
 
     aVDev.EnableOutput( false );
     aMtf.Record( &aVDev );
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 344041e19327..5c01273bac08 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -234,7 +234,7 @@ struct OSPath
 struct OSFont {
     OSFont *  pSucc;
     sal_uLong nID;
-    Font     aFont;
+    vcl::Font aFont;
 };
 
 struct OSBitmap {
@@ -980,7 +980,7 @@ void OS2METReader::ReadChrStr(bool bGivenPos, bool bMove, bool bExtra, sal_uInt1
     Point aP0;
     sal_uInt16 i, nLen;
     OSFont * pF;
-    Font aFont;
+    vcl::Font aFont;
     Size aSize;
 
     pF = pFontList;
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index e3138e65f3e1..7b313364c02f 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -164,7 +164,7 @@ private:
     RasterOp      eActROP;
     PictDrawingMethod eActMethod;
     Size          aActOvalSize;
-    Font          aActFont;
+    vcl::Font     aActFont;
 
     Fraction        aHRes;
     Fraction        aVRes;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index f2c915eb164a..197b8696ea84 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2124,7 +2124,7 @@ bool SdrPowerPointImport::ReadFontCollection()
                 PptFontEntityAtom* pFont = new PptFontEntityAtom;
                 ReadPptFontEntityAtom( rStCtrl, *pFont );
 
-                Font aFont;
+                vcl::Font aFont;
                 aFont.SetCharSet( pFont->eCharSet );
                 aFont.SetName( pFont->aName );
                 aFont.SetFamily( pFont->eFamily );
@@ -3085,7 +3085,7 @@ void SdrEscherImport::ImportHeaderFooterContainer( DffRecordHeader& rHd, HeaderF
 
 // no longer needed
 sal_Unicode SdrPowerPointImport::PPTSubstitute( sal_uInt16 /*nFont*/, sal_Unicode /*nChar*/,
-                                        sal_uInt32& /*nMappedFontId*/, Font& /*rFont*/, char /*nDefault*/) const
+                                        sal_uInt32& /*nMappedFontId*/, vcl::Font& /*rFont*/, char /*nDefault*/) const
 {
     return 0;
 }
@@ -3600,7 +3600,7 @@ void PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx
             PptFontEntityAtom* pFontEnityAtom = rManager.GetFontEnityAtom( nFont );
             if ( pFontEnityAtom )
             {
-                Font aFont;
+                vcl::Font aFont;
                 aFont.SetCharSet( pFontEnityAtom->eCharSet );
                 aFont.SetName( pFontEnityAtom->aName );
                 aFont.SetFamily( pFontEnityAtom->eFamily );
@@ -3659,7 +3659,7 @@ bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx
                     PptFontEntityAtom* pFontEnityAtom = rManager.GetFontEnityAtom( nFont );
                     if ( pFontEnityAtom )
                     {
-                        Font aFont;
+                        vcl::Font aFont;
                         aFont.SetCharSet( pFontEnityAtom->eCharSet );
                         aFont.SetName( pFontEnityAtom->aName );
                         aFont.SetFamily( pFontEnityAtom->eFamily );
@@ -3676,7 +3676,7 @@ bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx
 
 void PPTNumberFormatCreator::ImplGetNumberFormat( SdrPowerPointImport& rManager, SvxNumberFormat& rNumberFormat, sal_uInt32 /*nLevel*/)
 {
-    Font aFont;
+    vcl::Font aFont;
     PptFontEntityAtom* pAtom = rManager.GetFontEnityAtom( nBulletFont );
     if ( pAtom )
     {
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 565a87d0f7de..b1dd2a5cd99b 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -49,7 +49,7 @@ SVGFontExport::~SVGFontExport()
 
 
 
-SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const Font& rFont )
+SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const vcl::Font& rFont )
 {
     FontWeight      eWeight( WEIGHT_NORMAL );
     FontItalic      eItalic( ITALIC_NONE );
@@ -174,7 +174,7 @@ void SVGFontExport::implCollectGlyphs()
 
 
 
-void SVGFontExport::implEmbedFont( const Font& rFont )
+void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
 {
     if( mrExport.IsEmbedFonts() )
     {
@@ -190,7 +190,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont )
                 OUString     aCurIdStr( aEmbeddedFontStr );
                 OUString     aUnitsPerEM( OUString::number( nFontEM ) );
                 VirtualDevice       aVDev;
-                Font                aFont( rFont );
+                vcl::Font           aFont( rFont );
 
                 aFont.SetSize( Size( 0, nFontEM ) );
                 aFont.SetAlign( ALIGN_BASELINE );
@@ -309,7 +309,7 @@ void SVGFontExport::EmbedFonts()
 
             while( aFontItalicIter != rFontItalicMap.end() )
             {
-                Font aFont;
+                vcl::Font aFont;
 
                 aFont.SetName( (*aGlyphTreeIter).first );
                 aFont.SetWeight( (*aFontWeightIter).first );
diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx
index 9ef5059eb306..771d565f173c 100644
--- a/filter/source/svg/svgfontexport.hxx
+++ b/filter/source/svg/svgfontexport.hxx
@@ -37,7 +37,7 @@
 
 class ObjectRepresentation;
 class SVGExport;
-class Font;
+namespace vcl { class Font; }
 class OutputDevice;
 
 
@@ -57,9 +57,9 @@ private:
     ObjectVector        maObjects;
     sal_Int32           mnCurFontId;
 
-    GlyphSet&           implGetGlyphSet( const Font& rFont );
+    GlyphSet&           implGetGlyphSet( const vcl::Font& rFont );
     void                implCollectGlyphs();
-    void                implEmbedFont( const Font& rFont );
+    void                implEmbedFont( const vcl::Font& rFont );
     void                implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr );
 
 public:
@@ -68,7 +68,7 @@ public:
                         ~SVGFontExport();
 
     void                EmbedFonts();
-    OUString     GetMappedFontName( const OUString& rFontName ) const;
+    OUString            GetMappedFontName( const OUString& rFontName ) const;
 };
 
 #endif
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index af413b72ec45..5eb5bb4cbf46 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -289,7 +289,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
         rGradientId = "";
 }
 
-void SVGAttributeWriter::SetFontAttr( const Font& rFont )
+void SVGAttributeWriter::SetFontAttr( const vcl::Font& rFont )
 {
     if( rFont != maCurFont )
     {
@@ -1155,7 +1155,7 @@ void SVGTextWriter::startTextShape()
 
     {
         mbIsTextShapeStarted = true;
-        maParentFont = Font();
+        maParentFont = vcl::Font();
         mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextShape" );
         mpTextShapeElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemText, true, mbIWS );
         startTextParagraph();
@@ -1210,7 +1210,7 @@ void SVGTextWriter::startTextParagraph()
     {
         mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextParagraph" );
     }
-    maParentFont = Font();
+    maParentFont = vcl::Font();
     addFontAttributes( /* isTexTContainer: */ true );
     mpTextParagraphElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS );
     if( !mbIsListLevelStyleImage )
@@ -1246,7 +1246,7 @@ void SVGTextWriter::startTextPosition( bool bExportX, bool bExportY )
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( maTextPos.Y() ) );
 
     // if text is rotated, set transform matrix at new tspan element
-    const Font& rFont = mpVDev->GetFont();
+    const vcl::Font& rFont = mpVDev->GetFont();
     if( rFont.GetOrientation() )
     {
         Point   aRot( maTextPos );
@@ -1528,7 +1528,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
     Point                                   aPos;
     Point                                   aBaseLinePos( rPos );
     const FontMetric                        aMetric( mpVDev->GetFontMetric() );
-    const Font&                             rFont = mpVDev->GetFont();
+    const vcl::Font&                        rFont = mpVDev->GetFont();
 
     if( rFont.GetAlign() == ALIGN_TOP )
         aBaseLinePos.Y() += aMetric.GetAscent();
@@ -2408,7 +2408,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
     Point                                   aPos;
     Point                                   aBaseLinePos( rPos );
     const FontMetric                        aMetric( mpVDev->GetFontMetric() );
-    const Font&                             rFont = mpVDev->GetFont();
+    const vcl::Font&                        rFont = mpVDev->GetFont();
 
     if( rFont.GetAlign() == ALIGN_TOP )
         aBaseLinePos.Y() += aMetric.GetAscent();
@@ -3432,7 +3432,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     {
                         if( mrExport.IsUsePositionedCharacters() )
                         {
-                            Font aFont = ImplSetCorrectFontHeight();
+                            vcl::Font aFont = ImplSetCorrectFontHeight();
                             mpContext->SetFontAttr( aFont );
                             ImplWriteText( pA->GetPoint(), aText, NULL, 0 );
                         }
@@ -3456,7 +3456,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     {
                         if( mrExport.IsUsePositionedCharacters() )
                         {
-                            Font aFont = ImplSetCorrectFontHeight();
+                            vcl::Font aFont = ImplSetCorrectFontHeight();
                             mpContext->SetFontAttr( aFont );
                             ImplWriteText( pA->GetRect().TopLeft(), pA->GetText(), NULL, 0 );
                         }
@@ -3479,7 +3479,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     {
                         if( mrExport.IsUsePositionedCharacters() )
                         {
-                            Font aFont = ImplSetCorrectFontHeight();
+                            vcl::Font aFont = ImplSetCorrectFontHeight();
                             mpContext->SetFontAttr( aFont );
                             ImplWriteText( pA->GetPoint(), aText, pA->GetDXArray(), 0 );
                         }
@@ -3503,7 +3503,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                     {
                         if( mrExport.IsUsePositionedCharacters() )
                         {
-                            Font aFont = ImplSetCorrectFontHeight();
+                            vcl::Font aFont = ImplSetCorrectFontHeight();
                             mpContext->SetFontAttr( aFont );
                             ImplWriteText( pA->GetPoint(), aText, NULL, pA->GetWidth() );
                         }
@@ -3561,10 +3561,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
     }
 }
 
-Font SVGActionWriter::ImplSetCorrectFontHeight() const
+vcl::Font SVGActionWriter::ImplSetCorrectFontHeight() const
 {
-    Font    aFont( mpVDev->GetFont() );
-    Size    aSz;
+    vcl::Font aFont( mpVDev->GetFont() );
+    Size      aSz;
 
     ImplMap( Size( 0, aFont.GetHeight() ), aSz );
 
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index c4450a093382..24511423d9e7 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -92,7 +92,7 @@ class SVGAttributeWriter
 {
 private:
 
-    Font                       maCurFont;
+    vcl::Font                  maCurFont;
     Color                      maCurLineColor;
     Color                      maCurFillColor;
     SVGExport&                 mrExport;
@@ -117,7 +117,7 @@ public:
     void                    AddPaintAttr( const Color& rLineColor, const Color& rFillColor,
                                           const Rectangle* pObjBoundRect = NULL, const Gradient* pFillGradient = NULL );
 
-    void                    SetFontAttr( const Font& rFont );
+    void                    SetFontAttr( const vcl::Font& rFont );
     void                    startFontSettings();
     void                    endFontSettings();
     void                    setFontFamily();
@@ -205,20 +205,20 @@ class SVGTextWriter
     sal_Int32                                   mnLeftTextPortionLength;
     Point                                       maTextPos;
     long int                                    mnTextWidth;
-    bool                                    mbPositioningNeeded;
-    bool                                    mbIsNewListItem;
+    bool                                        mbPositioningNeeded;
+    bool                                        mbIsNewListItem;
     sal_Int16                                   meNumberingType;
     sal_Unicode                                 mcBulletChar;
     BulletListItemInfoMap                       maBulletListItemMap;
-    bool                                    mbIsListLevelStyleImage;
-    bool                                    mbLineBreak;
-    bool                                    mbIsURLField;
-    OUString                             msUrl;
-    OUString                             msHyperlinkIdList;
-    bool                                    mbIsPlacehlolderShape;
-    bool                                    mbIWS;
-    Font                                        maCurrentFont;
-    Font                                        maParentFont;
+    bool                                        mbIsListLevelStyleImage;
+    bool                                        mbLineBreak;
+    bool                                        mbIsURLField;
+    OUString                                    msUrl;
+    OUString                                    msHyperlinkIdList;
+    bool                                        mbIsPlacehlolderShape;
+    bool                                        mbIWS;
+    vcl::Font                                   maCurrentFont;
+    vcl::Font                                   maParentFont;
 
   public:
     SVGTextWriter( SVGExport& rExport );
@@ -377,7 +377,7 @@ private:
                                               const Reference< XShape >* pXShape = NULL,
                                               const GDIMetaFile* pTextEmbeddedBitmapMtf = NULL );
 
-    Font                    ImplSetCorrectFontHeight() const;
+    vcl::Font               ImplSetCorrectFontHeight() const;
 
 public: