use officecfg for SvtCJKOptions

and remove some unused options

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

5 files changed, 9 insertions, 13 deletions

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 8c3130a95c0f..33d54bee40e5 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -190,7 +190,7 @@ public:
         mbUseFontNameAsText(false),
         mbTextInited(false)
     {
-        m_bCJKEnabled = SvtCJKOptions().IsAnyEnabled();
+        m_bCJKEnabled = SvtCJKOptions::IsAnyEnabled();
         m_bCTLEnabled = SvtCTLOptions().IsCTLFontEnabled();
         mxBackColor = svtools::ColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
         Invalidate100PercentFontWidth();
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 28fa49e0ba8a..b266d04acd9f 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -427,14 +427,13 @@ void SvxSearchDialog::Construct_Impl()
     pImpl->aSelectionTimer.Start();
 
 
-    SvtCJKOptions aCJKOptions;
-    if(!aCJKOptions.IsJapaneseFindEnabled())
+    if(!SvtCJKOptions::IsJapaneseFindEnabled())
     {
         m_xJapOptionsCB->set_active( false );
         m_xJapOptionsCB->hide();
         m_xJapOptionsBtn->hide();
     }
-    if(!aCJKOptions.IsCJKFontEnabled())
+    if(!SvtCJKOptions::IsCJKFontEnabled())
     {
         m_xJapMatchFullHalfWidthCB->hide();
     }
@@ -693,7 +692,6 @@ void SvxSearchDialog::ShowOptionalControls_Impl()
 {
     DBG_ASSERT( pSearchItem, "no search item" );
 
-    SvtCJKOptions aCJKOptions;
     SvtCTLOptions aCTLOptions;
     SvtModuleOptions::EFactory eFactory = getModule(rBindings);
     bool bDrawApp = eFactory == SvtModuleOptions::EFactory::DRAW;
@@ -713,9 +711,9 @@ void SvxSearchDialog::ShowOptionalControls_Impl()
     m_xSelectionBtn->show();
     m_xIncludeDiacritics->show();
     m_xIncludeKashida->set_visible(aCTLOptions.IsCTLFontEnabled());
-    m_xJapMatchFullHalfWidthCB->set_visible(aCJKOptions.IsCJKFontEnabled());
-    m_xJapOptionsCB->set_visible(aCJKOptions.IsJapaneseFindEnabled());
-    m_xJapOptionsBtn->set_visible(aCJKOptions.IsJapaneseFindEnabled());
+    m_xJapMatchFullHalfWidthCB->set_visible(SvtCJKOptions::IsCJKFontEnabled());
+    m_xJapOptionsCB->set_visible(SvtCJKOptions::IsJapaneseFindEnabled());
+    m_xJapOptionsBtn->set_visible(SvtCJKOptions::IsJapaneseFindEnabled());
 
     if (bWriter)
     {
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 0c7c2a7de59c..c365becea715 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -66,8 +66,7 @@ namespace svx
         AddTabPage("labelTP_PARA_STD", RID_SVXPAGE_STD_PARAGRAPH);
         AddTabPage("labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH);
 
-        SvtCJKOptions aCJKOptions;
-        if( aCJKOptions.IsAsianTypographyEnabled() )
+        if( SvtCJKOptions::IsAsianTypographyEnabled() )
             AddTabPage("labelTP_PARA_ASIAN", RID_SVXPAGE_PARA_ASIAN);
         else
             RemoveTabPage("labelTP_PARA_ASIAN");
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 57059958dfc9..3bcf30be9698 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -60,7 +60,7 @@ InspectorTextPanel::InspectorTextPanel(weld::Widget* pParent)
 static bool GetPropertyValues(const OUString& rPropName, const uno::Any& rAny, OUString& rString)
 {
     // Hide Asian and Complex properties
-    if (!SvtCJKOptions().IsCJKFontEnabled() && rPropName.indexOf("Asian") != -1)
+    if (!SvtCJKOptions::IsCJKFontEnabled() && rPropName.indexOf("Asian") != -1)
         return false;
     if (!SvtCTLOptions().IsCTLFontEnabled() && rPropName.indexOf("Complex") != -1)
         return false;
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index fcc799283253..9e1eeffca214 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -100,8 +100,7 @@ void SAL_CALL SvxVertCTLTextTbxCtrl::statusChanged(const css::frame::FeatureStat
     bool bEnabled = false;
     if (rEvent.FeatureURL.Complete == ".uno:VerticalTextState")
     {
-        SvtCJKOptions aLangOptions;
-        bEnabled = m_bVisible && aLangOptions.IsVerticalTextEnabled();
+        bEnabled = m_bVisible && SvtCJKOptions::IsVerticalTextEnabled();
     }
     else if (rEvent.FeatureURL.Complete == ".uno:CTLFontState")
     {