fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

3 files changed, 13 insertions, 13 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);