diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-06-18 15:06:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-06-18 21:25:43 +0200 |
| commit | fd652938473aaaf0f716ea5c29ebb715ca7c290c (patch) | |
| tree | 8ade267418f11b11cf48327a042716dc7f80e153 /cui | |
| parent | 35245a605f3889fb3edbdab6fbe9f9233912fc59 (diff) | |
remove some dead defines
DISABLE_UNDERLINE_COLOR, DISABLE_WORDLINE, DISABLE_LANGUAGE
are dead since
commit ff178cca3384a1d15dcf51491df6196e487f47f4
Author: Caolán McNamara <caolanm@redhat.com>
Date: Mon Jun 8 12:21:01 2015 +0100
Resolves: tdf#91932 enable CaseMap property in impress/draw
DISABLE_BLINK is dead since
commit 1eb6210d678bbb0c875f0f72bd876a9e7795dfbe
Author: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Thu Apr 23 00:39:33 2020 +0200
tdf#132373 Remove blinking character property from the UI/editor
Change-Id: Ia1cb82b4692d6678ca900a8beaa854acf229fdf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96610
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/chardlg.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 34 |
2 files changed, 4 insertions, 31 deletions
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 06007847e9f2..e84ea0f162fa 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -166,7 +166,6 @@ private: bool m_bEnableNoneFontColor; Color m_aOrigFontColor; sal_uInt16 m_nHtmlMode; - bool m_bUnderlineColorDisabled; std::unique_ptr<weld::Label> m_xFontColorFT; std::unique_ptr<ColorListBox> m_xFontColorLB; diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 307be4f93e22..8c7cef3cb816 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1266,16 +1266,6 @@ void SvxCharNamePage::EnableSearchMode() void SvxCharNamePage::DisableControls( sal_uInt16 nDisable ) { - if ( DISABLE_LANGUAGE & nDisable ) - { - if ( m_xWestFontLanguageFT ) m_xWestFontLanguageFT->set_sensitive(false); - if ( m_xWestFontLanguageLB ) m_xWestFontLanguageLB->set_sensitive(false); - if ( m_xEastFontLanguageFT ) m_xEastFontLanguageFT->set_sensitive(false); - if ( m_xEastFontLanguageLB ) m_xEastFontLanguageLB->set_sensitive(false); - if ( m_xCTLFontLanguageFT ) m_xCTLFontLanguageFT->set_sensitive(false); - if ( m_xCTLFontLanguageLB ) m_xCTLFontLanguageLB->set_sensitive(false); - } - if ( DISABLE_HIDE_LANGUAGE & nDisable ) { if ( m_xWestFontLanguageFT ) m_xWestFontLanguageFT->hide(); @@ -1314,7 +1304,6 @@ SvxCharEffectsPage::SvxCharEffectsPage(weld::Container* pPage, weld::DialogContr , m_bOrigFontColor(false) , m_bNewFontColor(false) , m_bEnableNoneFontColor(false) - , m_bUnderlineColorDisabled(false) , m_xFontColorFT(m_xBuilder->weld_label("fontcolorft")) , m_xFontColorLB(new ColorListBox(m_xBuilder->weld_menu_button("fontcolorlb"), pController->getDialog())) , m_xFontTransparencyFT(m_xBuilder->weld_label("fonttransparencyft")) @@ -1638,14 +1627,10 @@ void SvxCharEffectsPage::SelectHdl_Impl(const weld::ComboBox* pBox) } else if (m_xPositionLB.get() != pBox) { - bool bUEnable = false; - if (!m_bUnderlineColorDisabled) - { - auto nUPos = m_xUnderlineLB->get_active(); - bUEnable = nUPos > 0; - m_xUnderlineColorFT->set_sensitive(bUEnable); - m_xUnderlineColorLB->set_sensitive(bUEnable); - } + auto nUPos = m_xUnderlineLB->get_active(); + bool bUEnable = nUPos > 0; + m_xUnderlineColorFT->set_sensitive(bUEnable); + m_xUnderlineColorLB->set_sensitive(bUEnable); auto nOPos = m_xOverlineLB->get_active(); bool bOEnable = nOPos > 0; @@ -2363,17 +2348,6 @@ void SvxCharEffectsPage::DisableControls( sal_uInt16 nDisable ) m_xEffectsFT->set_sensitive(false); m_xEffectsLB->set_sensitive(false); } - - if ( ( DISABLE_WORDLINE & nDisable ) == DISABLE_WORDLINE ) - m_xIndividualWordsBtn->set_sensitive(false); - - if ( ( DISABLE_UNDERLINE_COLOR & nDisable ) == DISABLE_UNDERLINE_COLOR ) - { - // disable the controls - m_xUnderlineColorFT->set_sensitive(false); - m_xUnderlineColorLB->set_sensitive(false); - m_bUnderlineColorDisabled = true; - } } void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet) |