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

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 25b003d44815..3f4b317a8b9f 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -45,7 +45,7 @@ class SubsetMap;
 
 /**************************************************************************/
 
-void SetFontStyle(const OUString &rStyleName, Font &rFont);
+void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont);
 
 /**************************************************************************/
 
@@ -84,7 +84,7 @@ public:
     {
     }
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
-    void SetFont(const Font& rFont);
+    void SetFont(const vcl::Font& rFont);
 };
 
 class SmFontDialog : public ModalDialog
@@ -95,7 +95,7 @@ class SmFontDialog : public ModalDialog
     CheckBox*       m_pItalicCheckBox;
     SmShowFont*     m_pShowFont;
 
-    Font    Face;
+    vcl::Font       Face;
 
     DECL_LINK(FontSelectHdl, ComboBox *);
     DECL_LINK(FontModifyHdl, ComboBox *);
@@ -108,8 +108,8 @@ class SmFontDialog : public ModalDialog
 public:
     SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes);
 
-    const Font& GetFont() const { return Face; }
-    void        SetFont(const Font &rFont);
+    const vcl::Font& GetFont() const { return Face; }
+    void        SetFont(const vcl::Font &rFont);
 };
 
 /**************************************************************************/
@@ -313,7 +313,7 @@ class SmShowSymbol : public Control
     virtual void    MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
     virtual void    Resize() SAL_OVERRIDE;
 
-    void setFontSize(Font &rFont) const;
+    void setFontSize(vcl::Font &rFont) const;
 
 public:
     SmShowSymbol(Window *pParent, WinBits nStyle)
@@ -382,7 +382,7 @@ public:
     }
 
     void    SetSymbol( const SmSym *pSym );
-    void    SetSymbol( sal_UCS4 cChar, const Font &rFont );
+    void    SetSymbol( sal_UCS4 cChar, const vcl::Font &rFont );
 };
 
 
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index eb17b368dbfd..1c469a3c1aea 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -77,17 +77,17 @@ private:
 
 public:
     SmSym();
-    SmSym(const OUString& rName, const Font& rFont, sal_UCS4 cChar,
+    SmSym(const OUString& rName, const vcl::Font& rFont, sal_UCS4 cChar,
           const OUString& rSet, bool bIsPredefined = false);
     SmSym(const SmSym& rSymbol);
 
     SmSym&      operator = (const SmSym& rSymbol);
 
-    const Font&     GetFace() const { return m_aFace; }
+    const vcl::Font&  GetFace() const { return m_aFace; }
     sal_UCS4        GetCharacter() const { return m_cChar; }
     const OUString&   GetName() const { return m_aName; }
 
-    void            SetFace( const Font& rFont )        { m_aFace = rFont; }
+    void            SetFace( const vcl::Font& rFont )        { m_aFace = rFont; }
     void            SetCharacter( sal_UCS4 cChar )   { m_cChar = cChar; }
 
     bool            IsPredefined() const        { return m_bPredefined; }
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 5323576f2055..f4a48e5d8d55 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -75,10 +75,10 @@ SmViewShell * SmGetActiveView();
 // SmFace
 
 
-bool    IsItalic( const Font &rFont );
-bool    IsBold( const Font &rFont );
+bool    IsItalic( const vcl::Font &rFont );
+bool    IsBold( const vcl::Font &rFont );
 
-class SmFace : public Font
+class SmFace : public vcl::Font
 {
     long    nBorderWidth;
 
@@ -123,24 +123,24 @@ class SmFontPickList
 {
 protected:
     sal_uInt16 nMaxItems;
-    std::deque<Font> aFontVec;
+    std::deque<vcl::Font> aFontVec;
 
-    bool     CompareItem(const Font & rFirstFont, const Font & rSecondFont) const;
-    OUString GetStringItem(const Font &rItem);
+    bool     CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont) const;
+    OUString GetStringItem(const vcl::Font &rItem);
 
 public:
     SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {}
     virtual ~SmFontPickList() { Clear(); }
 
-    virtual void    Insert(const Font &rFont);
-    virtual void    Update(const Font &rFont, const Font &rNewFont);
-    virtual void    Remove(const Font &rFont);
+    virtual void    Insert(const vcl::Font &rFont);
+    virtual void    Update(const vcl::Font &rFont, const vcl::Font &rNewFont);
+    virtual void    Remove(const vcl::Font &rFont);
 
-    void     Clear();
-    Font     Get(sal_uInt16 nPos = 0) const;
+    void            Clear();
+    vcl::Font       Get(sal_uInt16 nPos = 0) const;
 
-    SmFontPickList&  operator = (const SmFontPickList& rList);
-    Font             operator [] (sal_uInt16 nPos) const;
+    SmFontPickList& operator = (const SmFontPickList& rList);
+    vcl::Font       operator [] (sal_uInt16 nPos) const;
 
     void            ReadFrom(const SmFontDialog& rDialog);
     void            WriteTo(SmFontDialog& rDialog) const;
@@ -161,10 +161,10 @@ public:
 
     SmFontPickListBox& operator = (const SmFontPickList& rList);
 
-    virtual void    Insert(const Font &rFont) SAL_OVERRIDE;
+    virtual void    Insert(const vcl::Font &rFont) SAL_OVERRIDE;
     using   Window::Update;
-    virtual void    Update(const Font &rFont, const Font &rNewFont) SAL_OVERRIDE;
-    virtual void    Remove(const Font &rFont) SAL_OVERRIDE;
+    virtual void    Update(const vcl::Font &rFont, const vcl::Font &rNewFont) SAL_OVERRIDE;
+    virtual void    Remove(const vcl::Font &rFont) SAL_OVERRIDE;
 };
 
 #endif