fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

7 files changed, 11 insertions, 11 deletions

diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index d80dad32dcf4..479602b72d43 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -25,7 +25,7 @@
 #include <boost/shared_ptr.hpp>
 #include <vcl/mapmod.hxx>
 
-class Font;
+namespace vcl { class Font; }
 
 namespace sd { namespace slidesorter { namespace view {
 
@@ -36,7 +36,7 @@ class FontProvider
     : public SdGlobalResource
 {
 public:
-    typedef ::boost::shared_ptr<Font> SharedFontPointer;
+    typedef ::boost::shared_ptr<vcl::Font> SharedFontPointer;
 
     /** Return the single instance of this class.  Throws a RuntimeException
         when no instance can be created.
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index d4070714e45a..25d9192716d2 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -133,7 +133,7 @@ private:
     Rectangle maCustomAnimationEffectBoundingBox;
     const Image maTransitionEffectIcon;
     const Image maCustomAnimationEffectIcon;
-    const ::boost::shared_ptr<Font> mpPageNumberFont;
+    const ::boost::shared_ptr<vcl::Font> mpPageNumberFont;
 
     Size GetPageNumberAreaSize (const int nPageCount);
     Rectangle CalculatePreviewBoundingBox (
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index dcc9065c4b85..6cbaa06b29a9 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -73,7 +73,7 @@ private:
     ::boost::shared_ptr<cache::PageCache> mpCache;
     ::boost::shared_ptr<controller::Properties> mpProperties;
     ::boost::shared_ptr<view::Theme> mpTheme;
-    ::boost::shared_ptr<Font> mpPageNumberFont;
+    ::boost::shared_ptr<vcl::Font> mpPageNumberFont;
     ::boost::scoped_ptr<FramePainter> mpShadowPainter;
     ::boost::scoped_ptr<FramePainter> mpFocusBorderPainter;
     Bitmap maNormalBackground;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index c0decd7a34c7..814bf1a3561c 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -58,7 +58,7 @@ public:
         Font_PageNumber,
         Font_PageCount
     };
-    static ::boost::shared_ptr<Font> GetFont (
+    static ::boost::shared_ptr<vcl::Font> GetFont (
         const FontType eType,
         const OutputDevice& rDevice);
 
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 2863232ba22e..078b7b0c543d 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -244,7 +244,7 @@ void InsertionIndicatorOverlay::PaintPageCount (
 {
     // Paint the number of slides.
     ::boost::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme());
-    ::boost::shared_ptr<Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice));
+    ::boost::shared_ptr<vcl::Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice));
     if (pFont)
     {
         OUString sNumber (OUString::number(nSelectionCount));
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index b056787b3a53..7d82198d722e 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -236,7 +236,7 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount)
     OSL_ASSERT(mpWindow);
 
     // Set the correct font.
-    Font aOriginalFont (mpWindow->GetFont());
+    vcl::Font aOriginalFont (mpWindow->GetFont());
     if (mpPageNumberFont)
         mpWindow->SetFont(*mpPageNumberFont);
 
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index a0ce837beaf0..d7fddd2b7d5a 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -128,22 +128,22 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert
     }
 }
 
-::boost::shared_ptr<Font> Theme::GetFont (
+::boost::shared_ptr<vcl::Font> Theme::GetFont (
     const FontType eType,
     const OutputDevice& rDevice)
 {
-    ::boost::shared_ptr<Font> pFont;
+    ::boost::shared_ptr<vcl::Font> pFont;
 
     switch (eType)
     {
         case Font_PageNumber:
-            pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont()));
+            pFont.reset(new vcl::Font(Application::GetSettings().GetStyleSettings().GetAppFont()));
             pFont->SetTransparent(true);
             pFont->SetWeight(WEIGHT_BOLD);
             break;
 
         case Font_PageCount:
-            pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont()));
+            pFont.reset(new vcl::Font(Application::GetSettings().GetStyleSettings().GetAppFont()));
             pFont->SetTransparent(true);
             pFont->SetWeight(WEIGHT_NORMAL);
             {