summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-05 16:27:56 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-05 20:52:29 +0100
commit2e595954230b3a9ef555b2671699902c68532bdf (patch)
tree7a7686d78207f644865fc515b2ac7e22de4ade81
parent5f6af959fa0d0021ff473d34d5a4408cfca16a8f (diff)
[API CHANGE] Remove css::awt::XStyleSettings InfoTextColor and InfoFont
Change-Id: I2bee3f52a751ac1ed2b61a1488d6d58c1b36dcba
-rw-r--r--offapi/com/sun/star/awt/XStyleSettings.idl6
-rw-r--r--toolkit/source/awt/stylesettings.cxx22
-rw-r--r--toolkit/source/awt/stylesettings.hxx4
3 files changed, 0 insertions, 32 deletions
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl b/offapi/com/sun/star/awt/XStyleSettings.idl
index f9f6d934d8e6..47a55d6e4e62 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 833dd69c4384..8eb7fbce65a5 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 e0ada104ffa8..7809dc221904 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;