drop SvtLanguageOptions class

since it is just a wrapper over SvtCJKOptions and SvtCTLOptions.
Later I will replace those two with the equivalent officecfg calls

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

5 files changed, 15 insertions, 10 deletions

diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 932b287beb2a..d1a799a74778 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -35,6 +35,7 @@
 #include <svl/intitem.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
+#include <svl/ctloptions.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
@@ -224,7 +225,7 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
                 if ( (nOldScale != nNewScale) || (nOldScaleToPages != nNewScaleToPages) )
                     InvalidateTextWidth( rStyleSheet.GetName() );
 
-                if( SvtLanguageOptions().IsCTLFontEnabled() )
+                if( SvtCTLOptions().IsCTLFontEnabled() )
                 {
                     const SfxPoolItem *pItem = nullptr;
                     if( rChanges.GetItemState(ATTR_WRITINGDIR, true, &pItem ) == SfxItemState::SET )
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 553c6dc8370b..876817538a98 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -55,6 +55,8 @@
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/languageoptions.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
 
 #include <svx/svxdlg.hxx>
 #include <vcl/EnumContext.hxx>
@@ -962,9 +964,8 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
         // issue 21255 - Notes now support rich text formatting.
     }
 
-    SvtLanguageOptions  aLangOpt;
-    bool bDisableCTLFont = !aLangOpt.IsCTLFontEnabled();
-    bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled();
+    bool bDisableCTLFont = !SvtCTLOptions().IsCTLFontEnabled();
+    bool bDisableVerticalText = !SvtCJKOptions().IsVerticalTextEnabled();
 
     SdrView* pView = mrViewData.GetScDrawView();
     SfxItemSet aAttrSet(pView->GetModel()->GetItemPool());
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index cb67ced9817f..3a9a214050df 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -35,6 +35,8 @@
 #include <svl/stritem.hxx>
 #include <svl/zformat.hxx>
 #include <svl/languageoptions.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/langitem.hxx>
 #include <svx/numinf.hxx>
@@ -2746,9 +2748,8 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet )
             eBidiDir = EEHorizontalTextDirection::L2R;
     }
 
-    SvtLanguageOptions  aLangOpt;
-    bool bDisableCTLFont = !aLangOpt.IsCTLFontEnabled();
-    bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled();
+    bool bDisableCTLFont = !SvtCTLOptions().IsCTLFontEnabled();
+    bool bDisableVerticalText = !SvtCJKOptions().IsVerticalTextEnabled();
 
     SfxWhichIter aIter( rSet );
     sal_uInt16 nWhich = aIter.FirstWhich();
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index af00b3bdb76d..578f77edbf66 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -23,6 +23,8 @@
 #include <svl/whiter.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svl/languageoptions.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/UnitConversion.hxx>
 
@@ -426,7 +428,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
 
             case SID_DRAW_TEXT_VERTICAL:
             case SID_DRAW_CAPTION_VERTICAL:
-                if ( !SvtLanguageOptions().IsVerticalTextEnabled() )
+                if ( !SvtCJKOptions().IsVerticalTextEnabled() )
                     rSet.DisableItem( nWhich );
                 else
                     rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == nWhich ) );
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 57b0bf6696d1..41f53159b174 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -27,6 +27,7 @@
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
 #include <svl/languageoptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/svapp.hxx>
@@ -972,8 +973,7 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
 
             case FID_TAB_RTL:
                 {
-                    SvtLanguageOptions aLangOpt;
-                    if ( !aLangOpt.IsCTLFontEnabled() )
+                    if ( !SvtCTLOptions().IsCTLFontEnabled() )
                         rSet.DisableItem( nWhich );
                     else
                         rSet.Put( SfxBoolItem( nWhich, rDoc.IsLayoutRTL( nTab ) ) );