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

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index d5b5838c952b..691775f20836 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -167,7 +167,7 @@ namespace
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
         if( bFont )
         {
-            Font aFont;
+            vcl::Font aFont;
             aFont = rStyleSettings.GetFieldFont();
             aFont.SetColor( rStyleSettings.GetWindowTextColor() );
             SetPointFont( aFont );
@@ -1232,7 +1232,7 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
 
-        if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
+    if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
         (rDCEvt.GetType() == DATACHANGED_DISPLAY) ||
         (rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION) ||
         ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -1253,25 +1253,24 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
 void OAppDetailPageHelper::ImplInitSettings()
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-        Font aFont;
-        aFont = rStyleSettings.GetFieldFont();
-        aFont.SetColor( rStyleSettings.GetWindowTextColor() );
-        SetPointFont( aFont );
-        m_aTBPreview.SetPointFont( aFont );
-
-        SetTextColor( rStyleSettings.GetFieldTextColor() );
-        SetTextFillColor();
-        m_aBorder.SetTextColor( rStyleSettings.GetFieldTextColor() );
-        m_aBorder.SetTextFillColor();
-        m_aTBPreview.SetTextColor( rStyleSettings.GetFieldTextColor() );
-        m_aTBPreview.SetTextFillColor();
-
-        SetBackground( rStyleSettings.GetFieldColor() );
-        m_aBorder.SetBackground( rStyleSettings.GetFieldColor() );
-        m_aFL.SetBackground( rStyleSettings.GetFieldColor() );
-        m_aDocumentInfo.SetBackground( rStyleSettings.GetFieldColor() );
-        m_aTBPreview.SetBackground( rStyleSettings.GetFieldColor() );
-        m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
+    vcl::Font aFont;
+    aFont = rStyleSettings.GetFieldFont();
+    aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+    SetPointFont( aFont );
+    m_aTBPreview.SetPointFont( aFont );
+
+    SetTextColor( rStyleSettings.GetFieldTextColor() );
+    SetTextFillColor();
+    m_aBorder.SetTextColor( rStyleSettings.GetFieldTextColor() );
+    m_aBorder.SetTextFillColor();
+    m_aTBPreview.SetTextColor( rStyleSettings.GetFieldTextColor() );
+    m_aTBPreview.SetTextFillColor();
+    SetBackground( rStyleSettings.GetFieldColor() );
+    m_aBorder.SetBackground( rStyleSettings.GetFieldColor() );
+    m_aFL.SetBackground( rStyleSettings.GetFieldColor() );
+    m_aDocumentInfo.SetBackground( rStyleSettings.GetFieldColor() );
+    m_aTBPreview.SetBackground( rStyleSettings.GetFieldColor() );
+    m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
 }
 
 OPreviewWindow::OPreviewWindow(Window* _pParent)
@@ -1346,7 +1345,7 @@ void OPreviewWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackg
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     if( bFont )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 8f3a8d8952a1..e6e01c4e9809 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -111,7 +111,7 @@ void OCreationList::PreparePaint( SvTreeListEntry* _pEntry )
 
             if ( bIsMouseDownEntry )
             {
-                Font aFont( GetFont() );
+                vcl::Font aFont( GetFont() );
                 aFont.SetColor( GetSettings().GetStyleSettings().GetHighlightTextColor() );
                 Control::SetFont( aFont );
             }
@@ -384,7 +384,7 @@ void OTasksWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     if( bFont )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );
@@ -408,7 +408,7 @@ void OTasksWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
         m_aFL.SetBackground( rStyleSettings.GetFieldColor() );
     }
 
-    Font aFont = m_aDescription.GetControlFont();
+    vcl::Font aFont = m_aDescription.GetControlFont();
     aFont.SetWeight(WEIGHT_BOLD);
     m_aDescription.SetControlFont(aFont);
 }
@@ -565,7 +565,7 @@ void OApplicationDetailView::ImplInitSettings( bool bFont, bool bForeground, boo
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     if( bFont )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index c11b07b9a955..4f83589343b7 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -51,8 +51,8 @@ namespace dbaui
         // members related to drawing the currently hovered/selected entry
         SvTreeListEntry*        m_pMouseDownEntry;
         SvTreeListEntry*        m_pLastActiveEntry;
-        Color               m_aOriginalBackgroundColor;
-        Font                m_aOriginalFont;
+        Color                   m_aOriginalBackgroundColor;
+        vcl::Font               m_aOriginalFont;
 
     public:
         OCreationList( OTasksWindow& _rParent );
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 746a969ea49d..4f12cb9eb566 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -74,7 +74,7 @@ void OApplicationSwapWindow::ImplInitSettings( bool bFont, bool bForeground, boo
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     if( bFont )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 0e652e0c5945..72e37369f362 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -136,7 +136,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     if( bFont )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );
@@ -154,7 +154,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
     Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle};
     for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
     {
-        Font aFont = pWindows[i]->GetFont();
+        vcl::Font aFont = pWindows[i]->GetFont();
         aFont.SetWeight(WEIGHT_BOLD);
         pWindows[i]->SetFont(aFont);
         pWindows[i]->SetTextColor( aStyle.GetLightColor() );
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 8855e906831e..3b22fd88badc 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -153,7 +153,7 @@ void OAppBorderWindow::ImplInitSettings()
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     if( true )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );
@@ -546,7 +546,7 @@ void OApplicationView::ImplInitSettings()
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     if( true )
     {
-        Font aFont;
+        vcl::Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );