InfoFont/Color is not used by vcl now

anywhere anyone wanted to Get[Font|Color] give it the Label
ones instead.

why this is exposed through uno is bewildering, stubbed those
out for the moment

Change-Id: I7a31d027287436be1c075c76a370047efd010bf3

14 files changed, 6 insertions, 68 deletions

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 4d0fa1222b50..2ba8dfd20a31 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3414,7 +3414,7 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte
                 case mso_syscolorInactiveCaption :      aColor = rStyleSettings.GetDeactiveColor(); break;
                 case mso_syscolorInactiveCaptionText :  aColor = rStyleSettings.GetDeactiveColor(); break;
                 case mso_syscolorInfoBackground :       aColor = rStyleSettings.GetFaceColor(); break;
-                case mso_syscolorInfoText :             aColor = rStyleSettings.GetInfoTextColor(); break;
+                case mso_syscolorInfoText :             aColor = rStyleSettings.GetLabelTextColor(); break;
                 case mso_syscolorMenuText :             aColor = rStyleSettings.GetMenuTextColor(); break;
                 case mso_syscolorScrollbar :            aColor = rStyleSettings.GetFaceColor(); break;
                 case mso_syscolorWindow :               aColor = rStyleSettings.GetWindowColor(); break;
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 38f7eb0d0b89..2dcd0db75a9c 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -283,9 +283,6 @@ public:
     void                            SetLabelTextColor( const Color& rColor );
     const Color&                    GetLabelTextColor() const;
 
-    void                            SetInfoTextColor( const Color& rColor );
-    const Color&                    GetInfoTextColor() const;
-
     void                            SetWindowColor( const Color& rColor );
     const Color&                    GetWindowColor() const;
 
@@ -457,9 +454,6 @@ public:
     void                            SetLabelFont( const vcl::Font& rFont );
     const vcl::Font&                GetLabelFont() const;
 
-    void                            SetInfoFont( const vcl::Font& rFont );
-    const vcl::Font&                GetInfoFont() const;
-
     void                            SetRadioCheckFont( const vcl::Font& rFont );
     const vcl::Font&                GetRadioCheckFont() const;
 
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 61c2b4a4413f..a08b50dd8f42 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -144,7 +144,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
     maElapsedTime( rContext.mrEventQueue.getTimer() ),
     maViews(),
     maSpriteRectangle(),
-    maFont( Application::GetSettings().GetStyleSettings().GetInfoFont() ),
+    maFont( Application::GetSettings().GetStyleSettings().GetLabelFont() ),
     mpWakeUpEvent(),
     mpMouseHandler(),
     maSpriteSizePixel(),
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index f38bdcf38aa8..833dd69c4384 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -520,15 +520,12 @@ namespace toolkit
 
     ::sal_Int32 SAL_CALL WindowStyleSettings::getInfoTextColor() throw (RuntimeException, std::exception)
     {
-        StyleMethodGuard aGuard( *m_pData );
-        return lcl_getStyleColor( *m_pData, &StyleSettings::GetInfoTextColor );
+        return getLabelTextColor();
     }
 
 
-    void SAL_CALL WindowStyleSettings::setInfoTextColor( ::sal_Int32 _infotextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setInfoTextColor( ::sal_Int32 /*_infotextcolor*/ ) throw (RuntimeException, std::exception)
     {
-        StyleMethodGuard aGuard( *m_pData );
-        lcl_setStyleColor( *m_pData, &StyleSettings::SetInfoTextColor, _infotextcolor );
     }
 
 
@@ -888,15 +885,12 @@ namespace toolkit
 
     FontDescriptor SAL_CALL WindowStyleSettings::getInfoFont() throw (RuntimeException, std::exception)
     {
-        StyleMethodGuard aGuard( *m_pData );
-        return lcl_getStyleFont( *m_pData, &StyleSettings::GetInfoFont );
+        return getLabelFont();
     }
 
 
-    void SAL_CALL WindowStyleSettings::setInfoFont( const FontDescriptor& _infofont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setInfoFont( const FontDescriptor& /*_infofont*/ ) throw (RuntimeException, std::exception)
     {
-        StyleMethodGuard aGuard( *m_pData );
-        lcl_setStyleFont( *m_pData, &StyleSettings::SetInfoFont, &StyleSettings::GetInfoFont, _infofont );
     }
 
 
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 349877c2c6fe..7c25b9144f19 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -130,7 +130,6 @@ public:
         aStyleSet.SetMenuFont( aFont );
         aStyleSet.SetToolFont( aFont );
         aStyleSet.SetLabelFont( aFont );
-        aStyleSet.SetInfoFont( aFont );
         aStyleSet.SetRadioCheckFont( aFont );
         aStyleSet.SetPushButtonFont( aFont );
         aStyleSet.SetFieldFont( aFont );
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index fa821a2233af..f0f80f08f399 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -118,7 +118,6 @@ public:
         aStyleSet.SetMenuFont( aFont );
         aStyleSet.SetToolFont( aFont );
         aStyleSet.SetLabelFont( aFont );
-        aStyleSet.SetInfoFont( aFont );
         aStyleSet.SetRadioCheckFont( aFont );
         aStyleSet.SetPushButtonFont( aFont );
         aStyleSet.SetFieldFont( aFont );
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index fad4e6bc62e8..ca4a5d9928d7 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1183,7 +1183,6 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
 
     vcl::Font aLabelFont( getFont( [NSFont labelFontOfSize: 0], nDPIY, aAppFont ) );
     aStyleSettings.SetLabelFont( aLabelFont );
-    aStyleSettings.SetInfoFont( aLabelFont );
     aStyleSettings.SetRadioCheckFont( aLabelFont );
     aStyleSettings.SetFieldFont( aLabelFont );
     aStyleSettings.SetGroupFont( aLabelFont );
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1cab69d178dc..c245cbdeb802 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -114,7 +114,6 @@ struct ImplStyleData
     Color                           maHighlightColor;
     Color                           maHighlightLinkColor;
     Color                           maHighlightTextColor;
-    Color                           maInfoTextColor;
     Color                           maLabelTextColor;
     Color                           maLightBorderColor;
     Color                           maLightColor;
@@ -148,7 +147,6 @@ struct ImplStyleData
     vcl::Font                       maMenuFont;
     vcl::Font                       maToolFont;
     vcl::Font                       maLabelFont;
-    vcl::Font                       maInfoFont;
     vcl::Font                       maRadioCheckFont;
     vcl::Font                       maPushButtonFont;
     vcl::Font                       maFieldFont;
@@ -586,7 +584,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
     maHighlightColor( rData.maHighlightColor ),
     maHighlightLinkColor( rData.maHighlightLinkColor ),
     maHighlightTextColor( rData.maHighlightTextColor ),
-    maInfoTextColor( rData.maInfoTextColor ),
     maLabelTextColor( rData.maLabelTextColor ),
     maLightBorderColor( rData.maLightBorderColor ),
     maLightColor( rData.maLightColor ),
@@ -620,7 +617,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
     maMenuFont( rData.maMenuFont ),
     maToolFont( rData.maToolFont ),
     maLabelFont( rData.maLabelFont ),
-    maInfoFont( rData.maInfoFont ),
     maRadioCheckFont( rData.maRadioCheckFont ),
     maPushButtonFont( rData.maPushButtonFont ),
     maFieldFont( rData.maFieldFont ),
@@ -692,7 +688,6 @@ void ImplStyleData::SetStandardStyles()
     maToolFont                  = aStdFont;
     maGroupFont                 = aStdFont;
     maLabelFont                 = aStdFont;
-    maInfoFont                  = aStdFont;
     maRadioCheckFont            = aStdFont;
     maPushButtonFont            = aStdFont;
     maFieldFont                 = aStdFont;
@@ -713,7 +708,6 @@ void ImplStyleData::SetStandardStyles()
     maRadioCheckTextColor       = Color( COL_BLACK );
     maGroupTextColor            = Color( COL_BLACK );
     maLabelTextColor            = Color( COL_BLACK );
-    maInfoTextColor             = Color( COL_BLACK );
     maWindowColor               = Color( COL_WHITE );
     maWindowTextColor           = Color( COL_BLACK );
     maDialogColor               = Color( COL_LIGHTGRAY );
@@ -923,19 +917,6 @@ StyleSettings::GetLabelTextColor() const
 }
 
 void
-StyleSettings::SetInfoTextColor( const Color& rColor )
-{
-    CopyData();
-    mxData->maInfoTextColor = rColor;
-}
-
-const Color&
-StyleSettings::GetInfoTextColor() const
-{
-    return mxData->maInfoTextColor;
-}
-
-void
 StyleSettings::SetWindowColor( const Color& rColor )
 {
     CopyData();
@@ -1659,19 +1640,6 @@ StyleSettings::GetLabelFont() const
 }
 
 void
-StyleSettings::SetInfoFont( const vcl::Font& rFont )
-{
-    CopyData();
-    mxData->maInfoFont = rFont;
-}
-
-const vcl::Font&
-StyleSettings::GetInfoFont() const
-{
-    return mxData->maInfoFont;
-}
-
-void
 StyleSettings::SetRadioCheckFont( const vcl::Font& rFont )
 {
     CopyData();
@@ -2312,7 +2280,6 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
          (mxData->maRadioCheckTextColor     == rSet.mxData->maRadioCheckTextColor)      &&
          (mxData->maGroupTextColor          == rSet.mxData->maGroupTextColor)           &&
          (mxData->maLabelTextColor          == rSet.mxData->maLabelTextColor)           &&
-         (mxData->maInfoTextColor           == rSet.mxData->maInfoTextColor)            &&
          (mxData->maWindowColor             == rSet.mxData->maWindowColor)              &&
          (mxData->maWindowTextColor         == rSet.mxData->maWindowTextColor)          &&
          (mxData->maDialogColor             == rSet.mxData->maDialogColor)              &&
@@ -2357,7 +2324,6 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
          (mxData->maToolFont                == rSet.mxData->maToolFont)                 &&
          (mxData->maGroupFont               == rSet.mxData->maGroupFont)                &&
          (mxData->maLabelFont               == rSet.mxData->maLabelFont)                &&
-         (mxData->maInfoFont                == rSet.mxData->maInfoFont)                 &&
          (mxData->maRadioCheckFont          == rSet.mxData->maRadioCheckFont)           &&
          (mxData->maPushButtonFont          == rSet.mxData->maPushButtonFont)           &&
          (mxData->maFieldFont               == rSet.mxData->maFieldFont)                &&
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 6513083ce9bd..16b0e4101b07 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -211,9 +211,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
     aFont = aStyleSettings.GetLabelFont();
     aFont.SetFontHeight( defFontheight );
     aStyleSettings.SetLabelFont( aFont );
-    aFont = aStyleSettings.GetInfoFont();
-    aFont.SetFontHeight( defFontheight );
-    aStyleSettings.SetInfoFont( aFont );
     aFont = aStyleSettings.GetRadioCheckFont();
     aFont.SetFontHeight( defFontheight );
     aStyleSettings.SetRadioCheckFont( aFont );
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 4ba74a436b1b..2424ec333617 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -3933,7 +3933,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aStyleSet.SetRadioCheckTextColor( aTextColor );
     aStyleSet.SetGroupTextColor( aTextColor );
     aStyleSet.SetLabelTextColor( aTextColor );
-    aStyleSet.SetInfoTextColor( aTextColor );
     aStyleSet.SetTabTextColor( aTextColor );
     aStyleSet.SetTabRolloverTextColor( aTextColor );
     aStyleSet.SetTabHighlightTextColor( aTextColor );
@@ -4134,7 +4133,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aStyleSet.SetMenuFont( aFont );
     aStyleSet.SetToolFont( aFont );
     aStyleSet.SetLabelFont( aFont );
-    aStyleSet.SetInfoFont( aFont );
     aStyleSet.SetRadioCheckFont( aFont );
     aStyleSet.SetPushButtonFont( aFont );
     aStyleSet.SetFieldFont( aFont );
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index b71c375ab3ad..b285d5175a35 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -1795,7 +1795,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aStyleSet.SetRadioCheckTextColor( aTextColor );
     aStyleSet.SetGroupTextColor( aTextColor );
     aStyleSet.SetLabelTextColor( aTextColor );
-    aStyleSet.SetInfoTextColor( aTextColor );
     aStyleSet.SetWindowTextColor( aTextColor );
     aStyleSet.SetFieldTextColor( aTextColor );
 
@@ -1891,7 +1890,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aStyleSet.SetMenuFont( aFont );
     aStyleSet.SetToolFont( aFont );
     aStyleSet.SetLabelFont( aFont );
-    aStyleSet.SetInfoFont( aFont );
     aStyleSet.SetRadioCheckFont( aFont );
     aStyleSet.SetPushButtonFont( aFont );
     aStyleSet.SetFieldFont( aFont );
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 07b9bf8ed34e..7fff8dfa26e1 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1907,7 +1907,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     // Foreground
     aStyleSettings.SetRadioCheckTextColor( aFore );
     aStyleSettings.SetLabelTextColor( aFore );
-    aStyleSettings.SetInfoTextColor( aFore );
     aStyleSettings.SetDialogTextColor( aFore );
     aStyleSettings.SetGroupTextColor( aFore );
 
@@ -1957,7 +1956,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetMenuFont( aFont ); // will be changed according to pMenuBar
     aStyleSettings.SetToolFont( aFont ); // will be changed according to pToolBar
     aStyleSettings.SetLabelFont( aFont );
-    aStyleSettings.SetInfoFont( aFont );
     aStyleSettings.SetRadioCheckFont( aFont );
     aStyleSettings.SetPushButtonFont( aFont );
     aStyleSettings.SetFieldFont( aFont );
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 23a780502b5f..be38c5908799 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -226,7 +226,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     // Foreground
     style.SetRadioCheckTextColor( aFore );
     style.SetLabelTextColor( aFore );
-    style.SetInfoTextColor( aFore );
     style.SetDialogTextColor( aFore );
     style.SetGroupTextColor( aFore );
 
@@ -277,7 +276,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 
     style.SetMenuFont( aFont ); // will be changed according to pMenuBar
     style.SetLabelFont( aFont );
-    style.SetInfoFont( aFont );
     style.SetRadioCheckFont( aFont );
     style.SetPushButtonFont( aFont );
     style.SetFieldFont( aFont );
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 0f341f74b422..64d7cc04b4dc 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2655,7 +2655,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetRadioCheckTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) );
     aStyleSettings.SetGroupTextColor( aStyleSettings.GetRadioCheckTextColor() );
     aStyleSettings.SetLabelTextColor( aStyleSettings.GetRadioCheckTextColor() );
-    aStyleSettings.SetInfoTextColor( aStyleSettings.GetRadioCheckTextColor() );
     aStyleSettings.SetWindowColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOW ) ) );
     aStyleSettings.SetActiveTabColor( aStyleSettings.GetWindowColor() );
     aStyleSettings.SetWindowTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) );
@@ -2785,7 +2784,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetFieldFont( aAppFont );
     if ( aAppFont.GetWeight() > WEIGHT_NORMAL )
         aAppFont.SetWeight( WEIGHT_NORMAL );
-    aStyleSettings.SetInfoFont( aAppFont );
     aStyleSettings.SetToolFont( aAppFont );
     aStyleSettings.SetTabFont( aAppFont );