cui/source/inc/chardlg.hxx | 2 -- cui/source/tabpages/chardlg.cxx | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-)
New commits: commit 1d315555b3660fa2b1d6582eb624d75ba3cb1e97 Author: Justin Luth <[email protected]> AuthorDate: Wed Oct 15 17:26:46 2025 -0400 Commit: Justin Luth <[email protected]> CommitDate: Thu Oct 16 02:56:04 2025 +0200 tdf#138249 cui: ignore m_aOrigFontColor In LO 3.4, an 'Apply' button was introduced, and so any idea of "original color" is now irrelevant. Change-Id: I14e3812258fc7e66e94ce25600872d9bd9c0a397 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192463 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 4c2b0505e4ea..10474730f827 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -163,10 +163,8 @@ class SvxCharEffectsPage : public SvxCharBasePage { private: static const WhichRangesContainer pEffectsRanges; - bool m_bOrigFontColor; bool m_bNewFontColor; bool m_bEnableNoneFontColor; - Color m_aOrigFontColor; weld::TriStateEnabled m_aOutlineState; weld::TriStateEnabled m_aShadowState; diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 1d0d73dbe46c..52d4f681d115 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1321,7 +1321,6 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet) SvxCharEffectsPage::SvxCharEffectsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet) : SvxCharBasePage(pPage, pController, u"cui/ui/effectspage.ui"_ustr, u"EffectsPage"_ustr, rInSet) - , m_bOrigFontColor(false) , m_bNewFontColor(false) , m_bEnableNoneFontColor(false) , m_xFontColorFT(m_xBuilder->weld_label(u"fontcolorft"_ustr)) @@ -1531,7 +1530,6 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); SfxItemState eState = rSet.GetItemState( nWhich ); - m_bOrigFontColor = false; switch ( eState ) { case SfxItemState::UNKNOWN: @@ -1581,8 +1579,6 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) FieldUnit::PERCENT); } - m_aOrigFontColor = aColor; - m_bOrigFontColor = true; break; } } @@ -1608,9 +1604,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) aSelectedColor.m_aColor.SetAlpha(255 - static_cast<sal_uInt8>(basegfx::fround(fTransparency))); } - if (m_bOrigFontColor) - bChanged = aSelectedColor.m_aColor != m_aOrigFontColor; - if (m_bEnableNoneFontColor && bChanged && aSelectedColor.m_aColor == COL_NONE_COLOR) + if (m_bEnableNoneFontColor && aSelectedColor.m_aColor == COL_NONE_COLOR) bChanged = false; }
