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/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index cfa9eb3d79d1..aaec4fba9104 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -502,7 +502,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground(  ) throw (RuntimeExceptio
             nColor = pWindow->GetControlForeground().GetColor();
         else
         {
-            Font aFont;
+            vcl::Font aFont;
             if ( pWindow->IsControlFont() )
                 aFont = pWindow->GetControlFont();
             else
@@ -548,7 +548,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont(  ) throw (Runtime
         Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY );
         if ( xDev.is() )
         {
-            Font aFont;
+            vcl::Font aFont;
             if ( pWindow->IsControlFont() )
                 aFont = pWindow->GetControlFont();
             else
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 7a21338da7ca..527da88e2dde 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -832,7 +832,7 @@ sal_Int32 AccessibleDialogWindow::getForeground(  ) throw (RuntimeException, std
             nColor = m_pDialogWindow->GetControlForeground().GetColor();
         else
         {
-            Font aFont;
+            vcl::Font aFont;
             if ( m_pDialogWindow->IsControlFont() )
                 aFont = m_pDialogWindow->GetControlFont();
             else
@@ -876,7 +876,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont(  ) throw (RuntimeExcept
         Reference< awt::XDevice > xDev( m_pDialogWindow->GetComponentInterface(), UNO_QUERY );
         if ( xDev.is() )
         {
-            Font aFont;
+            vcl::Font aFont;
             if ( m_pDialogWindow->IsControlFont() )
                 aFont = m_pDialogWindow->GetControlFont();
             else
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 75c78d75bb75..57cf39d6c1f2 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -104,12 +104,12 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
 
     const Color aOldLineColor( pPrinter->GetLineColor() );
     const Color aOldFillColor( pPrinter->GetFillColor() );
-    const Font  aOldFont( pPrinter->GetFont() );
+    const vcl::Font aOldFont( pPrinter->GetFont() );
 
     pPrinter->SetLineColor( Color( COL_BLACK ) );
     pPrinter->SetFillColor();
 
-    Font aFont( aOldFont );
+    vcl::Font aFont( aOldFont );
     aFont.SetWeight( WEIGHT_BOLD );
     aFont.SetAlign( ALIGN_BOTTOM );
     pPrinter->SetFont( aFont );
@@ -839,9 +839,9 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
     AssertValidEditEngine();
 
     MapMode eOldMapMode( pPrinter->GetMapMode() );
-    Font aOldFont( pPrinter->GetFont() );
+    vcl::Font aOldFont( pPrinter->GetFont() );
 
-    Font aFont( GetEditEngine()->GetFont() );
+    vcl::Font aFont( GetEditEngine()->GetFont() );
     aFont.SetAlign( ALIGN_BOTTOM );
     aFont.SetTransparent( true );
     aFont.SetSize( Size( 0, 360 ) );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 71189892deff..d3e2bb48ab96 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1052,7 +1052,7 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
             if (!pOldSettings || aColor !=
                     pOldSettings-> GetStyleSettings().GetFieldTextColor())
             {
-                Font aFont(pEditEngine->GetFont());
+                vcl::Font aFont(pEditEngine->GetFont());
                 aFont.SetColor(aColor);
                 pEditEngine->SetFont(aFont);
             }
@@ -1220,11 +1220,11 @@ void EditorWindow::ImplSetFont()
         get_value_or( OUString() ) );
     if ( sFontName.isEmpty() )
     {
-        Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) );
+        vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) );
         sFontName = aTmpFont.GetName();
     }
     Size aFontSize(0, officecfg::Office::Common::Font::SourceViewFont::FontHeight::get());
-    Font aFont( sFontName, aFontSize );
+    vcl::Font aFont( sFontName, aFontSize );
     aFont.SetColor( GetSettings().GetStyleSettings().GetFieldTextColor() );
     SetPointFont( aFont );
     aFont = GetFont();
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index c893386868a3..c9973c4ba175 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1371,7 +1371,7 @@ void DialogWindow::InitSettings(bool bFont, bool bForeground, bool bBackground)
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     if( bFont )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         SetPointFont( aFont );
     }
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 59657216f7c0..02fb50f5c373 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -44,7 +44,7 @@ Layout::Layout (Window* pParent) :
 {
     SetBackground(GetSettings().GetStyleSettings().GetWindowColor());
 
-    Font aFont = GetFont();
+    vcl::Font aFont = GetFont();
     Size aSz = aFont.GetSize();
     aSz.Height() *= 1.5;
     aFont.SetSize(aSz);
@@ -145,7 +145,7 @@ void Layout::DataChanged (DataChangedEvent const& rDCEvt)
         aColor = GetSettings().GetStyleSettings().GetWindowTextColor();
         if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetWindowTextColor())
         {
-            Font aFont(GetFont());
+            vcl::Font aFont(GetFont());
             aFont.SetColor(aColor);
             SetFont(aFont);
             bInvalidate = true;
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index b43f798739f9..bd1edb03633d 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -1125,7 +1125,7 @@ void lcl_PrintHeader( Printer* pPrinter, const OUString& rTitle ) // not working
     pPrinter->SetLineColor( COL_BLACK );
     pPrinter->SetFillColor();
 
-    Font aFont( pPrinter->GetFont() );
+    vcl::Font aFont( pPrinter->GetFont() );
     aFont.SetWeight( WEIGHT_BOLD );
     aFont.SetAlign( ALIGN_BOTTOM );
     pPrinter->SetFont( aFont );
@@ -1170,11 +1170,11 @@ void DlgEditor::Print( Printer* pPrinter, const OUString& rTitle )    // not wor
 {
     {
         MapMode aOldMap( pPrinter->GetMapMode());
-        Font aOldFont( pPrinter->GetFont() );
+        vcl::Font aOldFont( pPrinter->GetFont() );
 
         MapMode aMap( MAP_100TH_MM );
         pPrinter->SetMapMode( aMap );
-        Font aFont;
+        vcl::Font aFont;
         aFont.SetAlign( ALIGN_BOTTOM );
         aFont.SetSize( Size( 0, 360 ));
         pPrinter->SetFont( aFont );