[Libreoffice-commits] core.git: 3 commits - dbaccess/source filter/source include/svtools include/tools include/vcl offapi/com slideshow/source toolkit/source vcl/android vcl/ios vcl/osx vcl/source vcl/unx vcl/win
Caolán McNamara
caolanm at redhat.com
Wed Oct 5 19:54:54 UTC 2016
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 2 -
filter/source/msfilter/msdffimp.cxx | 2 -
include/svtools/ivctrl.hxx | 2 -
include/tools/wintypes.hxx | 1
include/vcl/settings.hxx | 6 ---
offapi/com/sun/star/awt/XStyleSettings.idl | 6 ---
slideshow/source/engine/rehearsetimingsactivity.cxx | 2 -
toolkit/source/awt/stylesettings.cxx | 28 ---------------
toolkit/source/awt/stylesettings.hxx | 4 --
vcl/android/androidinst.cxx | 1
vcl/ios/iosinst.cxx | 1
vcl/osx/salframe.cxx | 1
vcl/source/app/settings.cxx | 34 -------------------
vcl/source/control/fixed.cxx | 6 +--
vcl/source/window/dialog.cxx | 2 -
vcl/source/window/settings.cxx | 3 -
vcl/unx/gtk/salnativewidgets-gtk.cxx | 2 -
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 2 -
vcl/unx/kde/salnativewidgets-kde.cxx | 2 -
vcl/unx/kde4/KDESalFrame.cxx | 2 -
vcl/win/window/salframe.cxx | 2 -
21 files changed, 8 insertions(+), 103 deletions(-)
New commits:
commit 2e595954230b3a9ef555b2671699902c68532bdf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 16:27:56 2016 +0100
[API CHANGE] Remove css::awt::XStyleSettings InfoTextColor and InfoFont
Change-Id: I2bee3f52a751ac1ed2b61a1488d6d58c1b36dcba
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl b/offapi/com/sun/star/awt/XStyleSettings.idl
index f9f6d93..47a55d6 100644
--- a/offapi/com/sun/star/awt/XStyleSettings.idl
+++ b/offapi/com/sun/star/awt/XStyleSettings.idl
@@ -121,9 +121,6 @@ interface XStyleSettings
/// specifies the color of inactive tabs of a tab control
[attribute] ::com::sun::star::util::Color InactiveTabColor;
- /// specifies the text color of dialog elements displaying some info text
- [attribute] ::com::sun::star::util::Color InfoTextColor;
-
/// specifies the text color of label elements in dialogs
[attribute] ::com::sun::star::util::Color LabelTextColor;
@@ -200,9 +197,6 @@ interface XStyleSettings
/// specifies the font for label controls
[attribute] FontDescriptor LabelFont;
- /// specifies the font of dialog elements displaying some info text
- [attribute] FontDescriptor InfoFont;
-
/// specifies the font of radio buttons and check boxes
[attribute] FontDescriptor RadioCheckFont;
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 833dd69..8eb7fbc 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -518,17 +518,6 @@ namespace toolkit
}
- ::sal_Int32 SAL_CALL WindowStyleSettings::getInfoTextColor() throw (RuntimeException, std::exception)
- {
- return getLabelTextColor();
- }
-
-
- void SAL_CALL WindowStyleSettings::setInfoTextColor( ::sal_Int32 /*_infotextcolor*/ ) throw (RuntimeException, std::exception)
- {
- }
-
-
::sal_Int32 SAL_CALL WindowStyleSettings::getLabelTextColor() throw (RuntimeException, std::exception)
{
StyleMethodGuard aGuard( *m_pData );
@@ -883,17 +872,6 @@ namespace toolkit
}
- FontDescriptor SAL_CALL WindowStyleSettings::getInfoFont() throw (RuntimeException, std::exception)
- {
- return getLabelFont();
- }
-
-
- void SAL_CALL WindowStyleSettings::setInfoFont( const FontDescriptor& /*_infofont*/ ) throw (RuntimeException, std::exception)
- {
- }
-
-
FontDescriptor SAL_CALL WindowStyleSettings::getRadioCheckFont() throw (RuntimeException, std::exception)
{
StyleMethodGuard aGuard( *m_pData );
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index e0ada10..7809dc2 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -101,8 +101,6 @@ namespace toolkit
virtual void SAL_CALL setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getInactiveTabColor() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getInfoTextColor() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setInfoTextColor( ::sal_Int32 _infotextcolor ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getLabelTextColor() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getLightColor() throw (css::uno::RuntimeException, std::exception) override;
@@ -152,8 +150,6 @@ namespace toolkit
virtual void SAL_CALL setGroupFont( const css::awt::FontDescriptor& _groupfont ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::awt::FontDescriptor SAL_CALL getLabelFont() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setLabelFont( const css::awt::FontDescriptor& _labelfont ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::FontDescriptor SAL_CALL getInfoFont() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setInfoFont( const css::awt::FontDescriptor& _infofont ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::awt::FontDescriptor SAL_CALL getRadioCheckFont() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setRadioCheckFont( const css::awt::FontDescriptor& _radiocheckfont ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::awt::FontDescriptor SAL_CALL getPushButtonFont() throw (css::uno::RuntimeException, std::exception) override;
commit 5f6af959fa0d0021ff473d34d5a4408cfca16a8f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 16:20:20 2016 +0100
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
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 4d0fa12..2ba8dfd 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 38f7eb0..2dcd0db 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 61c2b4a..a08b50d 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 f38bdcf..833dd69 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 349877c..7c25b91 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 fa821a2..f0f80f0 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 fad4e6b..ca4a5d9 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 1cab69d..c245cbd 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 6513083..16b0e41 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 4ba74a4..2424ec3 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 b71c375..b285d51 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 07b9bf8..7fff8df 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 23a7805..be38c59 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 0f341f7..64d7cc0 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 );
commit 57a1b2277df803387181f44ec70f4fa61c3fba4e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 16:08:38 2016 +0100
now ditch WB_INFO
Change-Id: I3b5505e06989c6bb8df5977b6690d32ca5f161e2
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index d0557dd..bc4fef3 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -49,7 +49,7 @@ OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent)
, m_eChildFocus(NONE)
{
// Header
- m_pHeader = VclPtr<FixedText>::Create( this, WB_CENTER | WB_INFO );
+ m_pHeader = VclPtr<FixedText>::Create( this, WB_CENTER );
m_pHeader->SetText( OUString(ModuleRes(STR_TAB_PROPERTIES)) );
m_pHeader->Show();
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 0b22ae3..1364c6c 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -185,7 +185,7 @@ public:
#define WB_ALIGN_TOP WB_TOP
#define WB_ALIGN_LEFT WB_LEFT
#define WB_NOCOLUMNHEADER WB_CENTER
-#define WB_HIGHLIGHTFRAME WB_INFO
+#define WB_HIGHLIGHTFRAME WB_IGNORETAB
#define WB_NOASYNCSELECTHDL WB_NOLABEL
class MnemonicGenerator;
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index cb0fd71..0d8e9b7 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -198,7 +198,6 @@ WinBits const WB_FLATBUTTON = SAL_CONST_INT64(0x4000000000);
WinBits const WB_PATHELLIPSIS = 0x00100000;
WinBits const WB_EXTRAOFFSET = 0x02000000;
WinBits const WB_NOMULTILINE = 0x10000000;
-WinBits const WB_INFO = 0x20000000;
// Window-Bits for CheckBox
WinBits const WB_CBLINESTYLE = SAL_CONST_INT64(0x2000000000);
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 0164ce8..ce01670 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -37,7 +37,7 @@
WB_LEFT | WB_CENTER | WB_RIGHT | \
WB_TOP | WB_VCENTER | WB_BOTTOM | \
WB_WORDBREAK | WB_NOLABEL | \
- WB_INFO | WB_PATHELLIPSIS)
+ WB_PATHELLIPSIS)
#define FIXEDLINE_VIEW_STYLE (WB_3DLOOK | WB_NOLABEL)
#define FIXEDBITMAP_VIEW_STYLE (WB_3DLOOK | \
WB_LEFT | WB_CENTER | WB_RIGHT | \
@@ -96,12 +96,12 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle )
const vcl::Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const
{
- return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont();
+ return _rStyle.GetLabelFont();
}
const Color& FixedText::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
{
- return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoTextColor() : _rStyle.GetLabelTextColor();
+ return _rStyle.GetLabelTextColor();
}
FixedText::FixedText( vcl::Window* pParent, WinBits nStyle )
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 9b60717..5884a73 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -96,7 +96,7 @@ static bool ImplIsMnemonicCtrl( vcl::Window* pWindow )
return true;
//This is the legacy pre-layout logic which we retain
//until we can be sure we can remove it
- if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) )
+ if (pWindow->GetStyle() & WB_NOLABEL)
return false;
vcl::Window* pNextWindow = pWindow->GetWindow( GetWindowType::Next );
if ( !pNextWindow )
More information about the Libreoffice-commits
mailing list