1 files changed, 67 insertions, 18 deletions

diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index a394ff955a4a..dfb9d386bed8 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -24,14 +24,21 @@
 
 SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
     const SfxItemSet& rSet)
-    : SfxTabPage(pPage, pController, "cui/ui/optaccessibilitypage.ui", "OptAccessibilityPage", &rSet)
-    , m_xAccessibilityTool(m_xBuilder->weld_check_button("acctool"))
-    , m_xTextSelectionInReadonly(m_xBuilder->weld_check_button("textselinreadonly"))
-    , m_xAnimatedGraphics(m_xBuilder->weld_check_button("animatedgraphics"))
-    , m_xAnimatedTexts(m_xBuilder->weld_check_button("animatedtext"))
-    , m_xAutoDetectHC(m_xBuilder->weld_check_button("autodetecthc"))
-    , m_xAutomaticFontColor(m_xBuilder->weld_check_button("autofontcolor"))
-    , m_xPagePreviews(m_xBuilder->weld_check_button("systempagepreviewcolor"))
+    : SfxTabPage(pPage, pController, u"cui/ui/optaccessibilitypage.ui"_ustr, u"OptAccessibilityPage"_ustr, &rSet)
+    , m_xAccessibilityTool(m_xBuilder->weld_check_button(u"acctool"_ustr))
+    , m_xTextSelectionInReadonly(m_xBuilder->weld_check_button(u"textselinreadonly"_ustr))
+    , m_xTextSelectionInReadonlyImg(m_xBuilder->weld_widget(u"locktextselinreadonly"_ustr))
+    , m_xAnimatedGraphics(m_xBuilder->weld_check_button(u"animatedgraphics"_ustr))
+    , m_xAnimatedGraphicsImg(m_xBuilder->weld_widget(u"lockanimatedgraphics"_ustr))
+    , m_xAnimatedTexts(m_xBuilder->weld_check_button(u"animatedtext"_ustr))
+    , m_xAnimatedTextsImg(m_xBuilder->weld_widget(u"lockanimatedtext"_ustr))
+    , m_xHighContrast(m_xBuilder->weld_combo_box(u"highcontrast"_ustr))
+    , m_xHighContrastImg(m_xBuilder->weld_widget(u"lockhighcontrast"_ustr))
+    , m_xHighContrastLabel(m_xBuilder->weld_label(u"label13"_ustr))
+    , m_xAutomaticFontColor(m_xBuilder->weld_check_button(u"autofontcolor"_ustr))
+    , m_xAutomaticFontColorImg(m_xBuilder->weld_widget(u"lockautofontcolor"_ustr))
+    , m_xPagePreviews(m_xBuilder->weld_check_button(u"systempagepreviewcolor"_ustr))
+    , m_xPagePreviewsImg(m_xBuilder->weld_widget(u"locksystempagepreviewcolor"_ustr))
 {
 #ifdef UNX
     // UNIX: read the gconf2 setting instead to use the checkbox
@@ -48,6 +55,29 @@ std::unique_ptr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create(weld::Contain
     return std::make_unique<SvxAccessibilityOptionsTabPage>(pPage, pController, *rAttrSet);
 }
 
+OUString SvxAccessibilityOptionsTabPage::GetAllStrings()
+{
+    OUString sAllStrings;
+    OUString labels[] = { u"label1"_ustr, u"label2"_ustr, u"label13"_ustr };
+
+    for (const auto& label : labels)
+    {
+        if (const auto& pString = m_xBuilder->weld_label(label))
+            sAllStrings += pString->get_label() + " ";
+    }
+
+    OUString checkButton[] = { u"acctool"_ustr,      u"textselinreadonly"_ustr, u"animatedgraphics"_ustr,
+                               u"animatedtext"_ustr, u"autofontcolor"_ustr,     u"systempagepreviewcolor"_ustr };
+
+    for (const auto& check : checkButton)
+    {
+        if (const auto& pString = m_xBuilder->weld_check_button(check))
+            sAllStrings += pString->get_label() + " ";
+    }
+
+    return sAllStrings.replaceAll("_", "");
+}
+
 bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
 {
     std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create() );
@@ -61,8 +91,8 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
         officecfg::Office::Common::Accessibility::IsAutomaticFontColor::set(m_xAutomaticFontColor->get_active(), batch);
     if ( !officecfg::Office::Common::Accessibility::IsSelectionInReadonly::isReadOnly() )
         officecfg::Office::Common::Accessibility::IsSelectionInReadonly::set(m_xTextSelectionInReadonly->get_active(), batch);
-    if ( !officecfg::Office::Common::Accessibility::AutoDetectSystemHC::isReadOnly() )
-        officecfg::Office::Common::Accessibility::AutoDetectSystemHC::set(m_xAutoDetectHC->get_active(), batch);
+    if ( !officecfg::Office::Common::Accessibility::HighContrast::isReadOnly() )
+        officecfg::Office::Common::Accessibility::HighContrast::set(m_xHighContrast->get_active(), batch);
     batch->commit();
 
     AllSettings aAllSettings = Application::GetSettings();
@@ -80,28 +110,47 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
 void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* )
 {
     m_xPagePreviews->set_active( officecfg::Office::Common::Accessibility::IsForPagePreviews::get() );
-    if( officecfg::Office::Common::Accessibility::IsForPagePreviews::isReadOnly() )
+    if (officecfg::Office::Common::Accessibility::IsForPagePreviews::isReadOnly())
+    {
         m_xPagePreviews->set_sensitive(false);
+        m_xPagePreviewsImg->set_visible(true);
+    }
 
     m_xAnimatedGraphics->set_active( officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::get() );
-    if( officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::isReadOnly() )
+    if (officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::isReadOnly())
+    {
         m_xAnimatedGraphics->set_sensitive(false);
+        m_xAnimatedGraphicsImg->set_visible(true);
+    }
 
     m_xAnimatedTexts->set_active( officecfg::Office::Common::Accessibility::IsAllowAnimatedText::get() );
-    if( officecfg::Office::Common::Accessibility::IsAllowAnimatedText::isReadOnly() )
+    if (officecfg::Office::Common::Accessibility::IsAllowAnimatedText::isReadOnly())
+    {
         m_xAnimatedTexts->set_sensitive(false);
+        m_xAnimatedTextsImg->set_visible(true);
+    }
 
     m_xAutomaticFontColor->set_active( officecfg::Office::Common::Accessibility::IsAutomaticFontColor::get() );
-    if( officecfg::Office::Common::Accessibility::IsAutomaticFontColor::isReadOnly() )
+    if (officecfg::Office::Common::Accessibility::IsAutomaticFontColor::isReadOnly())
+    {
         m_xAutomaticFontColor->set_sensitive(false);
+        m_xAutomaticFontColorImg->set_visible(true);
+    }
 
     m_xTextSelectionInReadonly->set_active( officecfg::Office::Common::Accessibility::IsSelectionInReadonly::get() );
-    if( officecfg::Office::Common::Accessibility::IsSelectionInReadonly::isReadOnly() )
+    if (officecfg::Office::Common::Accessibility::IsSelectionInReadonly::isReadOnly())
+    {
         m_xTextSelectionInReadonly->set_sensitive(false);
+        m_xTextSelectionInReadonlyImg->set_visible(true);
+    }
 
-    m_xAutoDetectHC->set_active( officecfg::Office::Common::Accessibility::AutoDetectSystemHC::get() );
-    if( officecfg::Office::Common::Accessibility::AutoDetectSystemHC::isReadOnly() )
-        m_xAutoDetectHC->set_sensitive(false);
+    m_xHighContrast->set_active( officecfg::Office::Common::Accessibility::HighContrast::get() );
+    if (officecfg::Office::Common::Accessibility::HighContrast::isReadOnly())
+    {
+        m_xHighContrast->set_sensitive(false);
+        m_xHighContrastLabel->set_sensitive(false);
+        m_xHighContrastImg->set_visible(true);
+    }
 
     AllSettings aAllSettings = Application::GetSettings();
     const MiscSettings& aMiscSettings = aAllSettings.GetMiscSettings();