fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

5 files changed, 13 insertions, 13 deletions

diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index ed48d5da24cf..073f4f10e6ae 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -45,7 +45,7 @@ public:
                     SvxShowCharSet( Window* pParent );
                     virtual ~SvxShowCharSet();
 
-    void            SetFont( const Font& rFont );
+    void            SetFont( const vcl::Font& rFont );
 
     void            SelectCharacter( sal_uInt32 cNew, bool bFocus = false );
     sal_UCS4        GetSelectCharacter() const;
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index e6b1c23eef84..36a6931e8190 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -38,7 +38,7 @@ class DialControlBmp : public VirtualDevice
 public:
     explicit            DialControlBmp( Window& rParent );
 
-    void                InitBitmap(const Font& rFont);
+    void                InitBitmap(const vcl::Font& rFont);
     void                SetSize(const Size& rSize);
     void                CopyBackground( const DialControlBmp& rSrc );
     void                DrawBackground( const Size& rSize, bool bEnabled );
@@ -135,7 +135,7 @@ protected:
         NumericField*       mpLinkField;
         sal_Int32           mnLinkedFieldValueMultiplyer;
         Size                maWinSize;
-        Font                maWinFont;
+        vcl::Font           maWinFont;
         sal_Int32           mnAngle;
         sal_Int32           mnInitialAngle;
         sal_Int32           mnOldAngle;
@@ -144,7 +144,7 @@ protected:
         bool                mbNoRot;
 
         explicit            DialControl_Impl( Window& rParent );
-        void                Init( const Size& rWinSize, const Font& rWinFont );
+        void                Init( const Size& rWinSize, const vcl::Font& rWinFont );
         void                SetSize( const Size& rWinSize );
     };
     std::auto_ptr< DialControl_Impl > mpImpl;
@@ -154,7 +154,7 @@ protected:
 
     void                SetRotation( sal_Int32 nAngle, bool bBroadcast );
 
-    void                Init( const Size& rWinSize, const Font& rWinFont );
+    void                Init( const Size& rWinSize, const vcl::Font& rWinFont );
     void                Init( const Size& rWinSize );
 
 private:
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index d0d6b9028751..d5a1b25bdff1 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -31,7 +31,7 @@
 class SvLBoxFontString : public SvLBoxString
 {
 private:
-    Font                        maFont;     /// The font used by this item.
+    vcl::Font                   maFont;     /// The font used by this item.
     bool                        mbUseColor; /// true = use font color, false = default listbox color.
 
 public:
@@ -40,7 +40,7 @@ public:
                                     SvTreeListEntry* pEntry,
                                     sal_uInt16 nFlags,
                                     const OUString& rString,
-                                    const Font& rFont,
+                                    const vcl::Font& rFont,
                                     const Color* pColor = NULL );
 
     virtual                     ~SvLBoxFontString();
@@ -62,10 +62,10 @@ public:
 class SVX_DLLPUBLIC SvxFontListBox : public SvTabListBox
 {
 private:
-    Font                        maStdFont;      /// Used for entries without specific font.
+    vcl::Font                   maStdFont;      /// Used for entries without specific font.
 
     // The following members are used to store additional parameters for InitEntry().
-    Font                        maEntryFont;    /// Current entry font used in InitEntry().
+    vcl::Font                   maEntryFont;    /// Current entry font used in InitEntry().
     const Color*                mpEntryColor;   /// Current entry color used in InitEntry().
     bool                        mbUseFont;      /// true = Use maEntryFont/mpEntryColor in InitEntry().
 
@@ -75,7 +75,7 @@ public:
     /** Inserts a list entry and sets the font used for this entry.
         @param pColor  The font color. NULL = use default listbox text color. */
     void                        InsertFontEntry(
-                                    const OUString& rString, const Font& rFont, const Color* pColor = NULL );
+                                    const OUString& rString, const vcl::Font& rFont, const Color* pColor = NULL );
 
     /** Selects/deselects an entry specified by its position in the list box. */
     void                        SelectEntryPos( sal_uLong nPos, bool bSelect = true );
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 8b73b5fb89e5..662b9b2501a2 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -217,7 +217,7 @@ public:
     };
 
 private:
-    Font            m_aDefaultFont;
+    vcl::Font      m_aDefaultFont;
     Link            m_aMasterStateProvider;
     Link            m_aMasterSlotExecutor;
 
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 79d257360ad0..0418f42c9dc1 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -102,7 +102,7 @@ class  SVX_DLLPUBLIC BulletsSettings_Impl:public BulletsSettings
 {
     public:
         sal_Unicode cBulletChar;
-        Font            aFont;
+        vcl::Font   aFont;
 
     public:
         BulletsSettings_Impl(NBType eTy)
@@ -259,7 +259,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
         virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) SAL_OVERRIDE;
         virtual bool IsCustomized(sal_uInt16 nIndex) SAL_OVERRIDE;
         sal_Unicode GetBulChar(sal_uInt16 nIndex);
-        Font GetBulCharFont(sal_uInt16 nIndex);
+        vcl::Font GetBulCharFont(sal_uInt16 nIndex);
         static BulletsTypeMgr& GetInstance();
 };