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

diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 02ab6ca16cfd..f8698dbff07e 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -199,7 +199,7 @@ namespace pcr
             OFontPropertyExtractor aPropExtractor(_rxModel);
 
             // some items, which may be in default state, have to be filled with non-void information
-            Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont();
+            vcl::Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont();
             ::com::sun::star::awt::FontDescriptor aDefaultFont = VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont);
 
             // get the current properties
@@ -490,7 +490,7 @@ namespace pcr
         // create and initialize the defaults
         _rppDefaults = new SfxPoolItem*[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1];
 
-        Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont();
+        vcl::Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont();
 
         SfxPoolItem** pCounter = _rppDefaults;  // want to modify this without affecting the out param _rppDefaults
         *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamily(), aDefaultVCLFont.GetName(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_FONT);
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 21ae5674eb40..413273410e66 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -335,7 +335,7 @@ namespace pcr
         AllSettings aAllSettings( GetSettings() );
         StyleSettings aStyleSettings( aAllSettings.GetStyleSettings() );
 
-        Font aFieldFont( aStyleSettings.GetFieldFont() );
+        vcl::Font aFieldFont( aStyleSettings.GetFieldFont() );
         aFieldFont.SetUnderline( UNDERLINE_SINGLE );
         aFieldFont.SetColor( aLinkColor.nColor );
         aStyleSettings.SetFieldFont( aFieldFont );
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index d5f791e78646..fed6d02e5dd8 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -846,8 +846,8 @@ void BubbleWindow::Paint( const Rectangle& )
 
     DrawImage( Point( BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT ), maBubbleImage );
 
-    Font aOldFont = GetFont();
-    Font aBoldFont = aOldFont;
+    vcl::Font aOldFont = GetFont();
+    vcl::Font aBoldFont = aOldFont;
     aBoldFont.SetWeight( WEIGHT_BOLD );
 
     SetFont( aBoldFont );
@@ -921,8 +921,8 @@ void BubbleWindow::RecalcTextRects()
 {
     Size aTotalSize;
     bool bFinished = false;
-    Font aOldFont = GetFont();
-    Font aBoldFont = aOldFont;
+    vcl::Font aOldFont = GetFont();
+    vcl::Font aBoldFont = aOldFont;
 
     aBoldFont.SetWeight( WEIGHT_BOLD );