fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

13 files changed, 20 insertions, 20 deletions

diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx
index fd488c82e27f..62bf3e2a3a46 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@@ -41,7 +41,7 @@ namespace cairocanvas
                             const geometry::Matrix2D&                       rFontMatrix,
                             const SurfaceProviderRef&                       rDevice ) :
         CanvasFont_Base( m_aMutex ),
-        maFont( Font( rFontRequest.FontDescription.FamilyName,
+        maFont( vcl::Font( rFontRequest.FontDescription.FamilyName,
                       rFontRequest.FontDescription.StyleName,
                       Size( 0, ::basegfx::fround(rFontRequest.CellSize) ) ) ),
         maFontRequest( rFontRequest ),
@@ -157,7 +157,7 @@ namespace cairocanvas
         return aRet;
     }
 
-    ::Font CanvasFont::getVCLFont() const
+    vcl::Font CanvasFont::getVCLFont() const
     {
         return *maFont;
     }
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 420e11bf7d4b..677b6c43aab2 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -71,10 +71,10 @@ namespace cairocanvas
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-        ::Font getVCLFont() const;
+        vcl::Font getVCLFont() const;
 
     private:
-        ::canvas::vcltools::VCLObject<Font>      maFont;
+        ::canvas::vcltools::VCLObject<vcl::Font> maFont;
         ::com::sun::star::rendering::FontRequest maFontRequest;
         SurfaceProviderRef                       mpRefDevice;
     };
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index f95d71a48485..4e489f435221 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -61,7 +61,7 @@ namespace cairocanvas
     static bool
     setupFontTransform( ::OutputDevice&                 rOutDev,
                         ::Point&                        o_rPoint,
-                        ::Font&                         io_rVCLFont,
+                        vcl::Font&                      io_rVCLFont,
                         const rendering::ViewState&     rViewState,
                         const rendering::RenderState&   rRenderState )
     {
@@ -247,7 +247,7 @@ namespace cairocanvas
     {
         setupOutDevState( rOutDev, pOwner, viewState, renderState, TEXT_COLOR );
 
-        ::Font aVCLFont;
+        vcl::Font aVCLFont;
 
         CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() );
 
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index f01e75a8e892..f2b5ddd700e2 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -510,7 +510,7 @@ namespace cairocanvas
 
             // Font rotation and scaling
             cairo_matrix_t m;
-            Font aFont = rOutDev.GetFont();
+            vcl::Font aFont = rOutDev.GetFont();
 
             cairo_matrix_init_identity(&m);
 
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index a7409ba5ba16..23f5ab6cd6fc 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -111,7 +111,7 @@ namespace dxcanvas
 
             // create the font
             const ::com::sun::star::rendering::FontRequest& rFontRequest = rCanvasFont->getFontRequest();
-            Font aFont(
+            vcl::Font aFont(
                 rFontRequest.FontDescription.FamilyName,
                 rFontRequest.FontDescription.StyleName,
                 Size( 0, ::basegfx::fround(rFontRequest.CellSize)));
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index 29c8ca6366bd..8c4969b75cbe 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -735,7 +735,7 @@ namespace oglcanvas
                 // create the font
                 const rendering::FontRequest& rFontRequest = pFont->getFontRequest();
                 const geometry::Matrix2D&     rFontMatrix = pFont->getFontMatrix();
-                ::Font aFont(
+                vcl::Font aFont(
                     rFontRequest.FontDescription.FamilyName,
                     rFontRequest.FontDescription.StyleName,
                     Size( 0, ::basegfx::fround(rFontRequest.CellSize)));
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 98fe92d2a3fb..a7e6f48b9306 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -42,7 +42,7 @@ namespace vclcanvas
                             rendering::XGraphicDevice&                      rDevice,
                             const OutDevProviderSharedPtr&                  rOutDevProvider ) :
         CanvasFont_Base( m_aMutex ),
-        maFont( Font( rFontRequest.FontDescription.FamilyName,
+        maFont( vcl::Font( rFontRequest.FontDescription.FamilyName,
                       rFontRequest.FontDescription.StyleName,
                       Size( 0, ::basegfx::fround(rFontRequest.CellSize) ) ) ),
         maFontRequest( rFontRequest ),
@@ -169,7 +169,7 @@ namespace vclcanvas
         return aRet;
     }
 
-    ::Font CanvasFont::getVCLFont() const
+    vcl::Font CanvasFont::getVCLFont() const
     {
         return *maFont;
     }
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index 6285e93efe28..30cc464bb800 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -74,10 +74,10 @@ namespace vclcanvas
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-        ::Font getVCLFont() const;
+        vcl::Font getVCLFont() const;
 
     private:
-        ::canvas::vcltools::VCLObject<Font>                                            maFont;
+        ::canvas::vcltools::VCLObject<vcl::Font>                                       maFont;
         ::com::sun::star::rendering::FontRequest                                       maFontRequest;
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice> mpRefDevice;
         OutDevProviderSharedPtr                                                        mpOutDevProvider;
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index eff50dc7df87..d14ec6bed060 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -1369,7 +1369,7 @@ namespace vclcanvas
 
         OutputDevice& rOutDev( mpOutDev->getOutDev() );
 
-        ::Font aVCLFont;
+        vcl::Font aVCLFont;
 
         CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() );
 
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 4a5091dcfbd6..673407ba7294 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -100,7 +100,7 @@ namespace vclcanvas
         }
 
         bool setupFontTransform( ::Point&                       o_rPoint,
-                                 ::Font&                        io_rVCLFont,
+                                 vcl::Font&                    io_rVCLFont,
                                  const rendering::ViewState&    rViewState,
                                  const rendering::RenderState&  rRenderState,
                                  ::OutputDevice&                rOutDev )
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 8f80939a2294..3b7eac05b3c6 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -85,11 +85,11 @@ namespace vclcanvas
 
             @returns false, if no text output should happen
          */
-        bool setupFontTransform( ::Point&                                                   o_rPoint,
-                                 ::Font&                                                    io_rVCLFont,
+        bool setupFontTransform( ::Point&                                           o_rPoint,
+                                 vcl::Font&                                         io_rVCLFont,
                                  const ::com::sun::star::rendering::ViewState&      viewState,
                                  const ::com::sun::star::rendering::RenderState&    renderState,
-                                 ::OutputDevice&                                            rOutDev );
+                                 ::OutputDevice&                                    rOutDev );
 
         /** Predicate, to determine whether polygon is actually an axis-aligned rectangle
 
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index e2ded77f3f76..58dfa55d3bb3 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -161,7 +161,7 @@ namespace vclcanvas
                              const OUString& rStr,
                              const Point&           rPos )
         {
-            Font aVCLFont;
+            vcl::Font aVCLFont;
             aVCLFont.SetHeight( 20 );
             aVCLFont.SetColor( Color( INFO_COLOR ) );
 
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index fc6e54a798f5..0bda848d1f57 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -319,7 +319,7 @@ namespace vclcanvas
                     }
 
                     // paint sprite prio
-                    Font aVCLFont;
+                    vcl::Font aVCLFont;
                     aVCLFont.SetHeight( std::min(long(20),aOutputSize.Height()) );
                     aVCLFont.SetColor( COL_RED );