core.git: Branch 'libreoffice-25-2' - cui/source

[Patrick Luby (via logerrit)]

 cui/source/options/appearance.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit c22df190a80d6ac8a5a2465e618d9dd814e55ea4
Author:     Patrick Luby <guibmac...@gmail.com>
AuthorDate: Mon Feb 24 16:13:02 2025 -0500
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Tue Feb 25 04:08:38 2025 +0100

    tdf#165382 Don't disable the color customization controls
    
    Mimic the behavior in the master branch and always keep the Items
    and Color controls in Customization section enabled so that users
    can override the document background and other colors.
    
    Change-Id: I795a8f35da328b18c363cbcbbf76b86067e4c358
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182122
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Reviewed-by: Patrick Luby <guibomac...@gmail.com>
    Tested-by: Jenkins

diff --git a/cui/source/options/appearance.cxx 
b/cui/source/options/appearance.cxx
index 3f4c7c6ca247..1fb60a467e4b 100644
--- a/cui/source/options/appearance.cxx
+++ b/cui/source/options/appearance.cxx
@@ -120,10 +120,7 @@ void SvxAppearanceTabPage::UpdateControlsState()
 {
     // in case of AUTOMATIC_COLOR_SCHEME, disable all the controls
     bool bEnableControls = m_xSchemeList->get_active_id() != 
AUTOMATIC_COLOR_SCHEME;
-    m_xColorEntryBtn->set_sensitive(bEnableControls);
-    m_xColorChangeBtn->set_sensitive(bEnableControls);
     m_xShowInDocumentChkBtn->set_sensitive(bEnableControls);
-    m_xColorRadioBtn->set_sensitive(bEnableControls);
     EnableImageControls(bEnableControls && GetActiveEntry() == 
static_cast<int>(APPBACKGROUND));
 }
 
@@ -183,10 +180,7 @@ bool SvxAppearanceTabPage::FillItemSet(SfxItemSet* /* rSet 
*/)
         m_bRestartRequired = true;
         // for automatic scheme, restart is not required as customizations 
section is disabled
         if (pColorConfig->GetCurrentSchemeName() == AUTOMATIC_COLOR_SCHEME)
-        {
             UpdateOldAppearance();
-            m_bRestartRequired = false;
-        }
     }
 
     // commit ColorConfig