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

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 80eaf8395a97..862c76ba3d0e 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -153,7 +153,7 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName
 
 
 
-typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const Font& i_rFont, OUString& o_rOutString );
+typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString );
 
 
 // Lazy binding of the GetSpecialCharsForEdit function as it resides in
@@ -166,11 +166,11 @@ extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
-extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const Font& i_rFont, OUString& o_rOutString );
+extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString );
 
 #endif
 
-OUString GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
+OUString GetSpecialCharsForEdit(Window* pParent, const vcl::Font& rFont)
 {
     static bool bDetermineFunction = false;
     static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0;
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index f88cfbbbb96f..05bb985b3298 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -119,7 +119,7 @@ bool RecentDocsView::isAcceptedFile(const OUString &rURL) const
 
 void RecentDocsView::SetMessageFont()
 {
-    Font aFont(GetFont());
+    vcl::Font aFont(GetFont());
     aFont.SetHeight(aFont.GetHeight()*1.3);
     SetFont(aFont);
 }
@@ -204,7 +204,7 @@ void RecentDocsView::Reload()
     // Set preferred width
     if (mFilteredItemList.empty())
     {
-        Font aOldFont(GetFont());
+        vcl::Font aOldFont(GetFont());
         SetMessageFont();
         set_width_request(std::max(GetTextWidth(maWelcomeLine1), GetTextWidth(maWelcomeLine2)));
         SetFont(aOldFont);
@@ -261,7 +261,7 @@ void RecentDocsView::Paint( const Rectangle &aRect )
     if ( mItemList.size() == 0 )
     {
         // No recent files to be shown yet. Show a welcome screen.
-        Font aOldFont(GetFont());
+        vcl::Font aOldFont(GetFont());
         SetMessageFont();
 
         long nTextHeight = GetTextHeight();
@@ -299,7 +299,7 @@ void RecentDocsView::LoseFocus()
 
 void RecentDocsView::Clear()
 {
-    Font aOldFont(GetFont());
+    vcl::Font aOldFont(GetFont());
     SetMessageFont();
     set_width_request(std::max(GetTextWidth(maWelcomeLine1), GetTextWidth(maWelcomeLine2)));
     SetFont(aOldFont);
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 5c9a20b8dc32..8c0bbee9bc33 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -191,7 +191,7 @@ void ThumbnailView::ImplInitSettings( bool bFont, bool bForeground, bool bBackgr
 
     if ( bFont )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetAppFont();
         if ( IsControlFont() )
             aFont.Merge( GetControlFont() );
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index e258b30b759f..584b1b387ea2 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -286,7 +286,7 @@ void BackingWindow::initControls()
 
     // setup nice colors
     mpCreateLabel->SetControlForeground(aButtonsText);
-    Font aFont(mpCreateLabel->GetSettings().GetStyleSettings().GetLabelFont());
+    vcl::Font aFont(mpCreateLabel->GetSettings().GetStyleSettings().GetLabelFont());
     aFont.SetSize(Size(0, aFont.GetSize().Height() * fMultiplier));
     mpCreateLabel->SetControlFont(aFont);
 
@@ -320,7 +320,7 @@ void BackingWindow::initControls()
 void BackingWindow::setupButton( PushButton* pButton )
 {
     // the buttons should have a bit bigger font
-    Font aFont(pButton->GetSettings().GetStyleSettings().GetPushButtonFont());
+    vcl::Font aFont(pButton->GetSettings().GetStyleSettings().GetPushButtonFont());
     aFont.SetSize(Size(0, aFont.GetSize().Height() * fMultiplier));
     pButton->SetControlFont(aFont);
 
@@ -331,7 +331,7 @@ void BackingWindow::setupButton( PushButton* pButton )
 
 void BackingWindow::setupButton( MenuButton* pButton )
 {
-    Font aFont(pButton->GetSettings().GetStyleSettings().GetPushButtonFont());
+    vcl::Font aFont(pButton->GetSettings().GetStyleSettings().GetPushButtonFont());
     aFont.SetSize(Size(0, aFont.GetSize().Height() * fMultiplier));
     pButton->SetControlFont(aFont);
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 7c2706ae248e..bf134ec4e543 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -793,7 +793,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Win
     aFmtLb.SetHelpId( HID_TEMPLATE_FMT );
     aFilterLb.SetHelpId( HID_TEMPLATE_FILTER );
     aFmtLb.SetStyle( aFmtLb.GetStyle() | WB_SORT | WB_HIDESELECTION );
-    Font aFont = aFmtLb.GetFont();
+    vcl::Font aFont = aFmtLb.GetFont();
     aFont.SetWeight( WEIGHT_NORMAL );
     aFmtLb.SetFont( aFont );
 
@@ -2392,7 +2392,7 @@ void SfxTemplateDialog_Impl::Initialize (void)
     m_aActionTbR.SetDropdownClickHdl(LINK(this, SfxTemplateDialog_Impl, ToolBoxRClick));
     m_aActionTbL.Show();
     m_aActionTbR.Show();
-    Font aFont=aFilterLb.GetFont();
+    vcl::Font aFont = aFilterLb.GetFont();
     aFont.SetWeight( WEIGHT_NORMAL );
     aFilterLb.SetFont( aFont );
     m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT );
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 8fd8ea8429b4..71eee2c27545 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -168,7 +168,7 @@ namespace sfx2
         SetLineColor();
 
         // bold font
-        Font aFont( GetFont() );
+        vcl::Font aFont( GetFont() );
         aFont.SetWeight( WEIGHT_BOLD );
         SetFont( aFont );
 
@@ -317,7 +317,7 @@ namespace sfx2
                 const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
                 // Font.
-                Font aFont = rStyleSettings.GetAppFont();
+                vcl::Font aFont = rStyleSettings.GetAppFont();
                 if ( IsControlFont() )
                     aFont.Merge( GetControlFont() );
                 SetZoomedPointFont( aFont );
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index f6c2e0ffe71a..3295859d3066 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -173,7 +173,7 @@ void TitleBar::PaintTitle (const Rectangle& rTitleBox)
         aTitleBox.Left() += gnLeftIconSpace + maIcon.GetSizePixel().Width() + gnRightIconSpace;
     }
 
-    Font aFont(GetFont());
+    vcl::Font aFont(GetFont());
     aFont.SetWeight(WEIGHT_BOLD);
     SetFont(aFont);
 
@@ -194,7 +194,7 @@ void TitleBar::PaintFocus (const Rectangle& rFocusBox)
 {
     Push(PUSH_FONT | PUSH_TEXTCOLOR);
 
-    Font aFont(GetFont());
+    vcl::Font aFont(GetFont());
     aFont.SetWeight(WEIGHT_BOLD);
     SetFont(aFont);