convert SvtAccessibilityOptions to officecfg where possible

Change-Id: Ia530086fe35e64379e55135d392020304b466325
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152649
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 14 insertions, 15 deletions

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b514990bfed3..20cd26c17fb3 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2624,7 +2624,7 @@ SwAccessibleMap* SwViewShell::GetAccessibleMap()
     return nullptr;
 }
 
-void SwViewShell::ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAccessibilityOptions)
+void SwViewShell::ApplyAccessibilityOptions()
 {
     if (utl::ConfigManager::IsFuzzing())
         return;
@@ -2635,12 +2635,12 @@ void SwViewShell::ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAcc
     }
     else
     {
-        mpAccOptions->SetAlwaysAutoColor(rAccessibilityOptions.GetIsAutomaticFontColor());
-        mpAccOptions->SetStopAnimatedGraphics(! rAccessibilityOptions.GetIsAllowAnimatedGraphics());
+        mpAccOptions->SetAlwaysAutoColor(SvtAccessibilityOptions::GetIsAutomaticFontColor());
+        mpAccOptions->SetStopAnimatedGraphics(! SvtAccessibilityOptions::GetIsAllowAnimatedGraphics());
 
         // Form view
         // Always set this option, not only if document is read-only:
-        mpOpt->SetSelectionInReadonly(rAccessibilityOptions.IsSelectionInReadonly());
+        mpOpt->SetSelectionInReadonly(SvtAccessibilityOptions::IsSelectionInReadonly());
     }
 }
 #endif // ENABLE_WASM_STRIP_ACCESSIBILITY
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 674ea0d8b900..bd4cdbe28f0f 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -1019,9 +1019,9 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, Con
                 auto pPagePreview = dynamic_cast<SwPagePreview *>( pViewShell );
 
                 if(pSwView)
-                    pSwView->ApplyAccessibilityOptions(*m_pAccessibilityOptions);
+                    pSwView->ApplyAccessibilityOptions();
                 else if(pPagePreview)
-                    pPagePreview->ApplyAccessibilityOptions(*m_pAccessibilityOptions);
+                    pPagePreview->ApplyAccessibilityOptions();
 
                 if(pSwView || pPagePreview || dynamic_cast< const SwSrcView *>( pViewShell ) !=  nullptr)
                 {
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 7e3d7674ab50..b907daf76f9d 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -283,7 +283,7 @@ SwViewOption::SwViewOption() :
     }
     m_nDivisionX = m_nDivisionY = 1;
 
-    m_bSelectionInReadonly = utl::ConfigManager::IsFuzzing() || SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly();
+    m_bSelectionInReadonly = utl::ConfigManager::IsFuzzing() || SvtAccessibilityOptions::IsSelectionInReadonly();
 
     m_bIdle = true;
 
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 6a46814facd6..05e1a2a1c2c3 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -268,7 +268,7 @@ public:
     SwDocShell* GetDocShell();
 
     // apply Accessibility options
-    void ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAccessibilityOptions);
+    void ApplyAccessibilityOptions();
 
     // Inline method to request values of new members
     // <mbResetFormDesignMode> and <mbFormDesignModeToReset>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 9df4a8828daf..0b03a001d033 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1127,7 +1127,7 @@ void SwPagePreview::Init()
 
     GetViewShell()->ApplyViewOptions( aOpt );
 #if !ENABLE_WASM_STRIP_ACCESSIBILITY
-    GetViewShell()->ApplyAccessibilityOptions(SW_MOD()->GetAccessibilityOptions());
+    GetViewShell()->ApplyAccessibilityOptions();
 #endif
 
     // adjust view shell option to the same as for print
@@ -1840,9 +1840,9 @@ uno::Reference< css::accessibility::XAccessible >
     return GetAccessible( false );
 }
 
-void SwPagePreview::ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAccessibilityOptions)
+void SwPagePreview::ApplyAccessibilityOptions()
 {
-    GetViewShell()->ApplyAccessibilityOptions(rAccessibilityOptions);
+    GetViewShell()->ApplyAccessibilityOptions();
 }
 
 void SwPagePreview::ShowHScrollbar(bool bShow)
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index dcd88c9e05d4..5e59d75ba043 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1011,7 +1011,7 @@ SwView::SwView(SfxViewFrame& _rFrame, SfxViewShell* pOldSh)
     m_pWrtShell->SetUIOptions( aUsrPref );
     m_pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() );
 #if !ENABLE_WASM_STRIP_ACCESSIBILITY
-    m_pWrtShell->ApplyAccessibilityOptions(SW_MOD()->GetAccessibilityOptions());
+    m_pWrtShell->ApplyAccessibilityOptions();
 #endif
 
     if( m_pWrtShell->GetDoc()->getIDocumentState().IsUpdateExpField() )
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 0a620a0a05e5..ecc718fa8aad 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -115,12 +115,11 @@ view::XSelectionSupplier* SwView::GetUNOObject()
     return m_pViewImpl->GetUNOObject();
 }
 
-void SwView::ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAccessibilityOptions)
+void SwView::ApplyAccessibilityOptions()
 {
 #if ENABLE_WASM_STRIP_ACCESSIBILITY
-    (void)rAccessibilityOptions;
 #else
-    m_pWrtShell->ApplyAccessibilityOptions(rAccessibilityOptions);
+    m_pWrtShell->ApplyAccessibilityOptions();
     //to enable the right state of the selection cursor in readonly documents
     if(GetDocShell()->IsReadOnly())
         m_pWrtShell->ShowCursor();