fdo#82577: Handle Font

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

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

6 files changed, 12 insertions, 12 deletions

diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 75b2f4f98371..61ce2c161842 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -126,7 +126,7 @@ public:
 
     void        SetArgName(const OUString &aArg);
     OUString    GetArgName();
-    void        SetArgNameFont(const Font&);
+    void        SetArgNameFont(const vcl::Font&);
 
     void        SetArgVal(const OUString &aVal);
     OUString    GetArgVal();
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 5b620117afb9..25dde889fd67 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -198,9 +198,9 @@ namespace formula
         OString    aActivWinId;
         bool            bIsShutDown;
 
-        Font            aFntBold;
-        Font            aFntLight;
-        sal_uInt16          nEdFocus;
+        vcl::Font       aFntBold;
+        vcl::Font       aFntLight;
+        sal_uInt16      nEdFocus;
         bool            bEditFlag;
         const IFunctionDescription* pFuncDesc;
         sal_Int32      nArgs;
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index bb700b22ff84..a6ca58b37c66 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -184,7 +184,7 @@ OUString ArgInput::GetArgName()
 }
 
 //Sets the Name for the Argument
-void ArgInput::SetArgNameFont   (const Font &aFont)
+void ArgInput::SetArgNameFont   (const vcl::Font &aFont)
 {
     if(pFtArg !=NULL) pFtArg->SetFont(aFont);
 }
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 8017ed3baf0b..d499a6d6d57c 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -296,7 +296,7 @@ void ParaWin::DelParaArray()
     ::std::vector<OUString>().swap(aParaArray);
 }
 
-void ParaWin::SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont)
+void ParaWin::SetArgumentFonts(const vcl::Font&aBoldFont,const vcl::Font&aLightFont)
 {
     aFntBold=aBoldFont;
     aFntLight=aLightFont;
@@ -366,7 +366,7 @@ void ParaWin::SetArgName(sal_uInt16 no,const OUString& aText)
     aArgInput[no].UpdateAccessibleNames();
 }
 
-void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont)
+void ParaWin::SetArgNameFont(sal_uInt16 no,const vcl::Font& aFont)
 {
     aArgInput[no].SetArgNameFont(aFont);
 }
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 2db916204b9f..adb2e74e862b 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -53,8 +53,8 @@ private:
         const IFunctionDescription* pFuncDesc;
         IControlReferenceHandler*   pMyParent;
         sal_uInt16          nArgs;      // unsuppressed arguments
-        Font            aFntBold;
-        Font            aFntLight;
+        vcl::Font        aFntBold;
+        vcl::Font        aFntLight;
 
         FixedText       *m_pFtEditDesc;
         FixedText       *m_pFtArgName;
@@ -114,7 +114,7 @@ protected:
 
 
         void            SetArgName      (sal_uInt16 no,const OUString &aArg);
-        void            SetArgNameFont  (sal_uInt16 no,const Font&);
+        void            SetArgNameFont  (sal_uInt16 no,const vcl::Font&);
         void            SetArgVal       (sal_uInt16 no,const OUString &aArg);
 
         void            HideParaLine(sal_uInt16 no);
@@ -142,7 +142,7 @@ public:
 
         OUString        GetArgument(sal_uInt16 no);
         void            SetArgument(sal_uInt16 no, const OUString& aString);
-        void            SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont);
+        void            SetArgumentFonts(const vcl::Font& aBoldFont,const vcl::Font& aLightFont);
 
         void            SetEdFocus(sal_uInt16 nEditLine); //Sichtbare Editzeilen
         sal_uInt16          GetSliderPos();
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index b5934e4d354c..74a9de07f7d4 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -37,7 +37,7 @@ StructListBox::StructListBox(Window* pParent, WinBits nBits ):
 {
     bActiveFlag=false;
 
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     Size aSize = aFont.GetSize();
     aSize.Height() -= 2;
     aFont.SetSize( aSize );