diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 7 | ||||
| -rw-r--r-- | svx/source/form/fmtextcontrolshell.cxx | 3 | ||||
| -rw-r--r-- | svx/source/sidebar/inspector/InspectorTextPanel.cxx | 6 | ||||
| -rw-r--r-- | svx/source/tbxctrls/verttexttbxctrl.cxx | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 8dcbcebcd446..8c3130a95c0f 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -44,6 +44,8 @@ #include <svl/itempool.hxx> #include <svl/stritem.hxx> #include <svl/languageoptions.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/ctloptions.hxx> #include <editeng/colritem.hxx> #include <editeng/fontitem.hxx> @@ -188,9 +190,8 @@ public: mbUseFontNameAsText(false), mbTextInited(false) { - SvtLanguageOptions aLanguageOptions; - m_bCJKEnabled = aLanguageOptions.IsAnyEnabled(); - m_bCTLEnabled = aLanguageOptions.IsCTLFontEnabled(); + m_bCJKEnabled = SvtCJKOptions().IsAnyEnabled(); + m_bCTLEnabled = SvtCTLOptions().IsCTLFontEnabled(); mxBackColor = svtools::ColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; Invalidate100PercentFontWidth(); } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index bf6d8fffcdca..bb6937277aa1 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -50,6 +50,7 @@ #include <svl/eitem.hxx> #include <svl/itempool.hxx> #include <svl/languageoptions.hxx> +#include <svl/ctloptions.hxx> #include <svtools/stringtransfer.hxx> #include <svl/whiter.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -899,7 +900,7 @@ namespace svx || ( nSlot == SID_ATTR_PARA_RIGHT_TO_LEFT ) ) { - if ( !SvtLanguageOptions().IsCTLFontEnabled() ) + if ( !SvtCTLOptions().IsCTLFontEnabled() ) { _rSet.DisableItem( nSlot ); nSlot = aIter.NextWhich(); diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx index b1d2641335b9..57059958dfc9 100644 --- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx +++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx @@ -25,6 +25,8 @@ #include <svx/sidebar/InspectorTextPanel.hxx> #include <svl/languageoptions.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/ctloptions.hxx> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <inspectorvalues.hrc> @@ -58,9 +60,9 @@ InspectorTextPanel::InspectorTextPanel(weld::Widget* pParent) static bool GetPropertyValues(const OUString& rPropName, const uno::Any& rAny, OUString& rString) { // Hide Asian and Complex properties - if (!SvtLanguageOptions().IsCJKFontEnabled() && rPropName.indexOf("Asian") != -1) + if (!SvtCJKOptions().IsCJKFontEnabled() && rPropName.indexOf("Asian") != -1) return false; - if (!SvtLanguageOptions().IsCTLFontEnabled() && rPropName.indexOf("Complex") != -1) + if (!SvtCTLOptions().IsCTLFontEnabled() && rPropName.indexOf("Complex") != -1) return false; if (bool bValue; rAny >>= bValue) diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 6be76a79f6c7..fcc799283253 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -20,6 +20,8 @@ #include <cppuhelper/supportsservice.hxx> #include <verttexttbxctrl.hxx> #include <svl/languageoptions.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/ctloptions.hxx> #include <vcl/toolbox.hxx> #include <vcl/weld.hxx> #include <rtl/ustring.hxx> @@ -98,12 +100,12 @@ void SAL_CALL SvxVertCTLTextTbxCtrl::statusChanged(const css::frame::FeatureStat bool bEnabled = false; if (rEvent.FeatureURL.Complete == ".uno:VerticalTextState") { - SvtLanguageOptions aLangOptions; + SvtCJKOptions aLangOptions; bEnabled = m_bVisible && aLangOptions.IsVerticalTextEnabled(); } else if (rEvent.FeatureURL.Complete == ".uno:CTLFontState") { - SvtLanguageOptions aLangOptions; + SvtCTLOptions aLangOptions; bEnabled = m_bVisible && aLangOptions.IsCTLFontEnabled(); } else |