diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-26 13:51:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-27 11:58:23 +0200 |
| commit | 5db72ef0b381671b7867bda759098a92909e06d8 (patch) | |
| tree | 986bc625c30f226a2498791ed4a6463f2b6fd913 /sw/source/uibase | |
| parent | f8ddaaf0f5e1fb61e0d4404ea28757bc652ae4be (diff) | |
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>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/app/docst.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/shells/annotsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/drwtxtex.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewstat.cxx | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 86cbd0291d1e..1654dfca3e36 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -38,6 +38,7 @@ #include <sfx2/viewfrm.hxx> #include <svl/stritem.hxx> #include <svl/languageoptions.hxx> +#include <svl/ctloptions.hxx> #include <sfx2/htmlmode.hxx> #include <swmodule.hxx> #include <fchrfmt.hxx> @@ -612,7 +613,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void) m_xTmp->SetItemSet( aTmpSet ); - if( SfxStyleFamily::Page == m_nFamily && SvtLanguageOptions().IsCTLFontEnabled() ) + if( SfxStyleFamily::Page == m_nFamily && SvtCTLOptions().IsCTLFontEnabled() ) { const SfxPoolItem *pItem = nullptr; if( aTmpSet.GetItemState( m_rDocSh.GetPool().GetTrueWhich( SID_ATTR_FRAMEDIRECTION, false ) , true, &pItem ) == SfxItemState::SET ) diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index a34f9a86a5da..8e95354f9026 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -782,7 +782,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) case SID_ATTR_PARA_LEFT_TO_RIGHT: case SID_ATTR_PARA_RIGHT_TO_LEFT: { - if ( !SvtLanguageOptions().IsCTLFontEnabled() ) + if ( !SvtCTLOptions().IsCTLFontEnabled() ) rSet.DisableItem( nWhich ); else { diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index c5437c3d4475..9eb7b9996696 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -861,7 +861,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) case SID_TEXTDIRECTION_LEFT_TO_RIGHT: case SID_TEXTDIRECTION_TOP_TO_BOTTOM: - if (!SvtLanguageOptions().IsVerticalTextEnabled()) + if (!SvtCJKOptions().IsVerticalTextEnabled()) { rSet.DisableItem(nSlotId); nSlotId = 0; @@ -890,7 +890,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) case SID_ATTR_PARA_LEFT_TO_RIGHT: case SID_ATTR_PARA_RIGHT_TO_LEFT: { - if (!SvtLanguageOptions().IsCTLFontEnabled()) + if (!SvtCTLOptions().IsCTLFontEnabled()) { rSet.DisableItem(nWhich); nSlotId = 0; diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 22e8d9451efa..9e336a019ba9 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -608,7 +608,7 @@ void SwView::GetDrawState(SfxItemSet &rSet) case SID_DRAW_TEXT_VERTICAL: case SID_DRAW_CAPTION_VERTICAL: - if ( bWeb || !SvtLanguageOptions().IsVerticalTextEnabled() ) + if ( bWeb || !SvtCJKOptions().IsVerticalTextEnabled() ) rSet.DisableItem( nWhich ); else if (nWhich != SID_DRAW_TEXT_VERTICAL) //tdf#113171 |